Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 18772) +++ applications/editors/josm/i18n/po/ar.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:14+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 18:10+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,20 +28,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "المساعدة" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "تجاهل URL سيئة التكوين: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -62,21 +62,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -84,6 +82,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -95,12 +93,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "التحذير" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "تجاهل عنوان الملف المشوه : \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -108,17 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "خطأ" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -303,5 +304,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -310,27 +311,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -348,5 +349,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "إلغاء" @@ -356,19 +357,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "الرجاء إنتقاء الطبقة الهدف." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "إنتقاء الطبقة الهدف." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "إدمج" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -377,5 +378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "لا يوجد طبقات هدف" @@ -488,13 +489,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -592,20 +593,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "الملف : {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -641,10 +642,10 @@ msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "ادمج {0} طرقات" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "الرجاء إختر على الأقل طريقتين للدمج." @@ -688,10 +689,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -710,11 +711,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "الكتابة فوقه" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "الملف موجود. الكتابة عليه ؟" @@ -761,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -768,6 +769,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -783,7 +784,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "نسخة مطابقة" @@ -833,30 +833,30 @@ msgstr "أخرُج من التطبيق." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "صدّر إلى GPX ..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "صدّر المعطيات إلى ملف GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "لا شيء للتصدير. إحصل على بعض المعطيات أولاً." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -864,13 +864,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -889,8 +889,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -898,7 +898,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -921,9 +921,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -935,5 +935,5 @@ msgstr "لا يجب على المتغير ''{0}'' أن يكون صفراً" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -941,5 +941,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "" @@ -1085,6 +1085,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "جديد" @@ -1213,5 +1213,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "ألصِق" @@ -1299,11 +1299,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "إحفَظ" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "إحفظ المعطيات الحالية." @@ -1358,10 +1358,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "إحفظ كــ ..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "إحفظ المعطيات الحالية في ملف جديد." @@ -1378,29 +1378,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "أعرض تقرير عن الحالة" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "المساعدة: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "تقرير عن الحالة" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1556,5 +1556,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1562,5 +1562,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1607,55 +1607,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "إستبدل الخيار" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "نسخ الكائنات المختارة الى وسيط الصق" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "تحديث المعطيات" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1664,5 +1661,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1670,29 +1667,29 @@ msgstr "لا يوجد تغييرات للتحميل." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1706,11 +1703,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1721,5 +1718,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1729,22 +1726,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1755,19 +1752,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1776,5 +1773,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1783,15 +1780,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1903,17 +1900,17 @@ msgstr "تقدّم بطيء" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "تنزيل معطيات جهاز نظام تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "جاري تحميل المعطيات" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1921,5 +1918,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1973,9 +1970,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "أخطاء عند التنزيل" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -1993,5 +1990,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1999,5 +1996,5 @@ msgstr "النمط: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2113,5 +2110,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2131,17 +2128,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2151,22 +2148,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2174,15 +2171,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "تكبير/تصغير" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "تكبير/تصغيرو تحريك الخريطة" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2190,10 +2187,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "بحث..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2202,58 +2199,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "الرجاء إدخال مصطلحات البحث." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "عبارة منتظمة" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "إستبدل الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "أضف إلى اخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "أحذف من الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "case sensitive" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "regular expression" msgstr "عبارة منتظمة" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"شارع الفران\" - 'شارع الفران' في أي مفتاح أو إسم." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +msgid "name:Bak - 'Bak' anywhere in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2261,34 +2257,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Special targets:" msgstr "الأهداف المميزة:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" msgstr "النوع: - نوع الغرض (عقدة, طريق, علاقة)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "المستخدم:... - كلّ الأغراض اللتي قام المستخدم بتغييرها" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "العقد:... - الغرض ذات عدد العقد المحدد" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2296,43 +2292,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "مغيير - كلّ الأغراض المغييرة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "المختارة - كلّ الأغراض المختارة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "غير المكتملة - كلّ الأغراض غير المكتملة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "غير المسمات - كلّ الأغراض غير المسمات" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "إستعمل | أو أو للدمج بالأو المنطقي" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2342,51 +2338,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "إبحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "إبدء البحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "لم أجد شيء مطابق لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "وجدتُ {0} مطابقات" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" @@ -2400,40 +2396,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2442,9 +2438,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2453,5 +2449,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2549,7 +2545,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2660,5 +2656,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2683,5 +2679,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2689,6 +2685,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2755,17 +2751,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2799,10 +2785,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2835,20 +2821,20 @@ msgstr "التعاقب" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2870,10 +2856,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2915,5 +2901,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "القيمة الجديدة" @@ -2960,7 +2946,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "لا يجب على المتغير ''{0}'' أن يكون صفراً" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -2969,10 +2955,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -2981,5 +2967,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -2988,5 +2974,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -2995,5 +2981,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3002,5 +2988,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3008,5 +2994,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3015,5 +3001,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3022,5 +3008,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3029,5 +3015,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3036,10 +3022,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3120,25 +3106,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "ج." #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "ش." #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "غ." #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "ش." -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3146,5 +3132,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3152,5 +3138,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3160,26 +3146,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3188,5 +3174,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3249,24 +3235,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3274,5 +3260,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3300,10 +3286,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3314,7 +3300,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "لا يجب على المتغير ''{0}'' أن يكون صفراً" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3468,10 +3454,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "خطأ : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3483,6 +3469,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3496,5 +3482,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3508,6 +3494,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3529,6 +3515,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "الخلفية" @@ -3546,19 +3532,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "حزام لامبيرت (أستونيا)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3572,26 +3575,51 @@ msgstr "مركاتوري" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3606,10 +3634,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "لا تظهر مرة اخرى" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3617,32 +3645,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "غير كامل" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "من النوع طريق" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "خط سكة حديد" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "مجرى مياه" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "إستعمال الأرض" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3655,5 +3683,5 @@ msgstr[5] "{0} عقد" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3691,6 +3719,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "التناقض" @@ -3700,11 +3728,11 @@ msgstr "مضيف غير معروف" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3900,11 +3928,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4019,5 +4047,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4025,18 +4053,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(لا يوجد أي غرض)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "الطبقة ليست في اللائحة." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4157,67 +4185,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4225,68 +4253,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4294,5 +4322,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4300,30 +4328,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4331,5 +4359,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4337,14 +4365,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4352,5 +4380,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4358,54 +4386,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "أزِل" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4414,5 +4442,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4421,5 +4449,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4428,5 +4456,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4435,5 +4463,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4442,6 +4470,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4450,6 +4478,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4460,5 +4488,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4470,5 +4498,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4477,19 +4505,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4498,9 +4526,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4510,5 +4538,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4532,84 +4560,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "تم حذفه" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4619,17 +4647,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4638,9 +4666,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4655,19 +4683,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4683,10 +4711,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4696,10 +4724,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4726,27 +4754,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4771,22 +4799,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4794,5 +4822,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4883,6 +4911,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4897,5 +4925,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4909,21 +4937,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4931,5 +4959,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5016,10 +5044,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5039,17 +5067,17 @@ msgstr "تكدس الأوامر: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "حلّ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5058,25 +5086,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5088,13 +5116,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5106,8 +5134,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5174,5 +5202,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5204,34 +5232,34 @@ msgstr "إفتح لائحة بكلّ التبقات المحملة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "أمحي الطبقة المختارة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "عرض/إخفاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل." @@ -5241,22 +5269,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "غيّر غرض {0}" -msgstr[1] "غيّر {0} غرضين" -msgstr[2] "غيّر {0} أغراض" -msgstr[3] "غيّر {0} غرض" -msgstr[4] "غيّر {0} أغراض" -msgstr[5] "غيّر {0} غرض" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "قيمة فارغة ستمحي المفتاح." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5265,10 +5288,10 @@ msgstr "<مختلف>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "غيّر القيم ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5277,5 +5300,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5284,9 +5307,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "الرجاء إختيار مفتاح" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "الرجاء إختيار قيمة" @@ -5310,102 +5333,98 @@ msgstr "عضو من" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "أضف صفة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "الخصائص: {0} / العضويات: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "الخصائص/ العضويات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "غيّر العلاقة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "أمحي من العلاقة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "أمحي الخصائص" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "حرّر الخصائص" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "حرّر المحتاح المنقى لكلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "الخصائص: {0} / العضويات: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "الخصائص/ العضويات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "غيّر العلاقة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "أمحي من العلاقة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "أمحي الخصائص" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "العلاقات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "إفتح لائحة بكل العلاقات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "العلاقات: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "إفتح محرر نص للعلاقة المحددة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "أمحي العلاقة المحددة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "أنشئ علاقة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5434,5 +5453,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5444,14 +5463,14 @@ msgstr "الخيار: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "أنقر لتكبير/تصغير محتويات اللوحة" @@ -5532,12 +5551,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5555,5 +5574,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5561,5 +5580,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5567,18 +5586,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5587,14 +5606,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5604,9 +5623,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5616,15 +5635,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5632,5 +5651,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5638,20 +5657,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5660,66 +5679,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5728,9 +5747,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5739,41 +5758,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5783,19 +5802,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "جاري تحميل المعطيات" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5816,10 +5842,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5833,5 +5855,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5901,9 +5923,9 @@ msgstr "إشارات مرجعية" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5912,52 +5934,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "خ. العرض الأدنى" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "خ. الطول الأدنى" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "خ. العرض الأقصى" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "خ. الطول الأقصى" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5965,52 +5987,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "العلبة المحاطة" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "مصادر المعطيات و نوعيتها" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "معطيات OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "نزّل كطبقة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6018,38 +6040,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "نزّل المساحة" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "نزّل" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "المساحة المطلوبة ضخمة جداً، إحتمال أن ترفض من قبل الخادم" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "هذه المساحة ممكن تنزيلها، القياس مقبول من الخادم" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6071,21 +6093,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6824,8 +6846,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -6998,5 +7020,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7008,5 +7030,5 @@ msgstr "النوع" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7053,5 +7075,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7065,5 +7087,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7074,5 +7096,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7081,19 +7103,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7103,32 +7125,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7150,5 +7172,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7210,7 +7232,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "لا يجب على المتغير ''{0}'' أن يكون صفراً" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7240,33 +7262,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "زوم الى {0}" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "التاريخ" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7292,7 +7312,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7332,7 +7351,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "بدون ذكر الإسم" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7360,12 +7378,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "الإصدار {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "تم حذفه" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7423,10 +7440,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7637,5 +7654,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7658,17 +7675,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7684,7 +7701,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7727,29 +7744,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "حمّل التغييرات" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7757,38 +7774,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7796,16 +7813,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7849,24 +7866,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "الصول لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "إقرءGPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "لا توقيت للنقطة {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7874,33 +7891,33 @@ msgstr "جاري قراءة {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 +#, java-format +msgid "GPS start: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 +#, java-format +msgid "GPS end: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 -#, java-format -msgid "GPS start: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -#, java-format -msgid "GPS end: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 #, java-format msgid "current delta: {0}s" msgstr "الإنحراف الحالي: {0}ث" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "إختلاف في التوقيت الجغرافي: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7913,14 +7930,14 @@ msgstr[5] "صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} من ضمن المسلك." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7928,32 +7945,32 @@ msgstr "صور (*.jpg)JPEG" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "الصورة" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 +msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "" @@ -8043,5 +8060,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8093,10 +8110,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8106,11 +8123,11 @@ "مضرة.
أنظر هنا إذا أردت تحميل بعض الأثرات:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8120,29 +8137,29 @@ msgstr "محوّل من: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "نزّل من أو.أس.أم على طول هذا المسلك" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "نزّل كلّ شيئ بين:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} أمتار" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "المساحة القصوى للمطلب:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} كلم²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8151,9 +8168,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8161,5 +8178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8167,23 +8184,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "طبقة المعطيات {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "خارج عن المنطقة المنزلة" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8192,5 +8209,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8204,5 +8221,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8215,11 +8232,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8228,21 +8245,34 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "لم أجد طريق \"من\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" msgstr "" @@ -8350,9 +8380,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "أعرض/أخفي النص/الأيقونات" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8414,5 +8444,5 @@ msgstr "القيمة الغيابية غير معروفة حالياً (لم يتم بعد التعيين)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8420,5 +8450,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8426,5 +8456,5 @@ msgstr "القيمة الجديدة لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8433,5 +8463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "أدخل زوج جديد مفتاح/قيمة" @@ -8554,40 +8584,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "اللون" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "نوع الطلاء {0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "الطبقة: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "إختر" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "الرجاء إختيار اللون لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "الألوان المستعملة في الأغراض المختلفة في ج.أو.أس.أم." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "الألوان" @@ -9020,17 +9050,17 @@ "يجب عليك إعادة بدء تشغيل ج.أو.أس.أم كي تُأخذ بعض التغييرات بعين الإعتبار." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "أعرض الإحداثيات كــ" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "منهج الإسقاط" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9040,5 +9070,5 @@ msgstr "إسقاط الخريطة" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9096,81 +9126,81 @@ msgstr "الإختصار" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9179,6 +9209,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9344,10 +9374,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9357,13 +9387,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9371,18 +9401,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "ميزات خيارية:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "طريق مغلقة الدوران" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "نوع غير معروف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9393,15 +9423,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "خطأ في التحليل النحوي {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "العناصر من الفصيلة {0} هي مدعومة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9415,18 +9445,18 @@ msgstr[5] "غيّر {0} غرض" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "الخيار فارغ !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "الخيار غير مناسب !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "طبّق الخيار المسبق" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "غيّر الخصائص" @@ -9442,6 +9472,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9450,8 +9480,21 @@ msgstr "جاري الإتصال بلخادم أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "جاري تحميل النقاط {0} إلى {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9566,11 +9609,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9580,40 +9623,40 @@ msgstr "جاري تنزيل معطيات أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9676,5 +9719,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9687,66 +9730,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "اعداد..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "جاري الإرسال..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9781,5 +9824,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9806,5 +9849,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9812,5 +9855,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9823,5 +9866,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9972,5 +10015,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9979,38 +10022,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10018,19 +10061,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "غرض غير مسموح به معروف بــ id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10040,10 +10083,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10053,25 +10094,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10512,5 +10553,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10519,12 +10560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10534,5 +10568,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10542,10 +10576,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10554,5 +10583,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10561,5 +10590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10568,9 +10597,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10580,5 +10616,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10587,5 +10623,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10594,5 +10630,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10601,10 +10637,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10613,10 +10649,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10627,5 +10663,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10635,5 +10671,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11344,5 +11380,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11355,28 +11391,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11406,13 +11459,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11421,13 +11474,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11707,43 +11760,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "حمّل الموقع من الخابية ( فقط عند تمكين الخابية)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11751,5 +11809,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11780,5 +11838,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11806,5 +11864,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11812,28 +11870,28 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11842,24 +11900,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "خطء في صيغة المعطيات" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12885,20 +12934,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "هل تريد السماح بذلك ؟" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13020,13 +13069,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13596,5 +13641,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +msgid "Unconnected coastline" msgstr "" @@ -14236,12 +14281,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "نزّل" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14279,7 +14322,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "إدمج {0} عقد" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14345,29 +14387,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14376,5 +14418,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14382,10 +14424,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14398,24 +14440,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14426,57 +14468,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "إشارات مرجعية" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26786,8 +26833,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26807,34 +26853,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "خرائط NPE" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26844,9 +26879,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "شوارع NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26860,19 +26898,73 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "help" -#~ msgstr "مساعدة" - -#~ msgid "Help / About" -#~ msgstr "المساعدة / حول" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "خرائط NPE" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Edit Properties" +#~ msgstr "حرّر الخصائص" #~ msgid "Unknown version" @@ -27097,4 +27189,10 @@ #~ msgid "Show Author Panel" #~ msgstr "أعرض لوحة المؤلف" + +#~ msgid "Help / About" +#~ msgstr "المساعدة / حول" + +#~ msgid "help" +#~ msgstr "مساعدة" #~ msgid "Open a layer first (GPX, OSM, cache)" Index: applications/editors/josm/i18n/po/bg.po =================================================================== --- applications/editors/josm/i18n/po/bg.po (revision 18772) +++ applications/editors/josm/i18n/po/bg.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 15:14+0000\n" -"Last-Translator: pl71 \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 18:01+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Помощ" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнориране на неправилна препратка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,22 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Внимание" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнориране неправилен адрес на файл: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"Невъзможно четенето от файла ''{0}''.
Грешката е:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,18 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"Невъзможно четенето от файла ''{0}''.
Грешката е:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Грешка" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -308,5 +309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -315,27 +316,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -353,5 +354,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Отмяна" @@ -361,19 +362,19 @@ msgstr "Моля, изберете поне една качена вече точка, линия или връзка." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Моля, изберете слой за целта" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Изберете целеви слой" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Обединение" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -384,5 +385,5 @@ "обедини." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Няма слоеве за целта" @@ -495,13 +496,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -599,20 +600,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Няма отворени пакети с промени" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Няма отворени пакети с промени" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -652,10 +653,10 @@ "последователност от възли)." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Обединяване {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Моля, изберете поне две линии за комбиниране." @@ -699,10 +700,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -721,11 +722,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Презаписване" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Файлът съществъва. Да го подменя ли?" @@ -773,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -780,6 +781,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -795,7 +796,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -823,5 +823,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Дублиране" @@ -846,30 +846,30 @@ msgstr "Изход от програмата." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Всички формати" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Експорт до GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Експорт на данните до GPX файл." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Няма нищо за експорт. Първо съберете някакви данни." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -877,13 +877,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -902,8 +902,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -911,7 +911,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -934,9 +934,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -948,5 +948,5 @@ msgstr "Параметърът {0} не трябва да е празен" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -954,5 +954,5 @@ msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Експорт в GPX файл" @@ -1098,6 +1098,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Нов" @@ -1230,5 +1230,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Поставяне" @@ -1316,11 +1316,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Запазване" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Запазване на текущите данни." @@ -1377,10 +1377,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Запазване като…" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Записване на текущите данни в нов файл." @@ -1399,10 +1399,10 @@ "обекти също." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Показване статус" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1410,20 +1410,20 @@ "грешката." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Помощ: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Статус Репорт" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Копиране в клипборда и затваряне" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1594,5 +1594,5 @@ msgstr "Незапелен възел" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1600,5 +1600,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1645,55 +1645,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Няма открит текущ набор от данни" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Обновяване на избраните елементи" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "Обновява избраните обекти от сървъра (сваляне отново на данните)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Обновява избраното" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Няма избрани примитиви за обновяване." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Няма нищо избрано." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Обновяване на избраните елементи" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Качване на данни" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1704,5 +1701,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1710,29 +1707,29 @@ msgstr "Няма промени за качване." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Нищо за качване. Първо създайте някакви данни." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Синхронизиране само на възел {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Синхронизиране само на пътя {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Синхронизиране само на релацията {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Синхронизиране на целия набор данни" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1754,11 +1751,11 @@ "редактирането.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Забелязани са конфликти" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1774,5 +1771,5 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1782,22 +1779,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Пакета с изменения е затворен" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1808,19 +1805,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Обновяване на примитива." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1829,5 +1826,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1836,15 +1833,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1956,17 +1953,17 @@ msgstr "По-бавно възпроизвеждане" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Сваляне на GPS данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Свалени GPX данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Сваляне на данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1975,5 +1972,5 @@ "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "В тази зона няма намерени данни" @@ -2027,9 +2024,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Грешки при Сваляне" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2047,5 +2044,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2053,5 +2050,5 @@ msgstr "Режим: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2149,8 +2146,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." msgstr "" -"Нарисувайте правоъгълник от желания размер и отпуснете бутона на мишката." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2160,9 +2155,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Нарисувай сегмент от път за да се образува правоъгълник." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2177,5 +2171,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2195,17 +2189,17 @@ msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Преместване на елементи" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Премести" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Отмени преместването" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2215,13 +2209,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Винаги да се премества и този прозорец да не се показва повече" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2230,9 +2224,9 @@ "най-близката точка." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Отпуснете бутона на мишката за да спрете въртенето." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2242,15 +2236,15 @@ "превкл.); Shift-Ctrl за обхождане на селекцията; или смяна на селекцията" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Мащаб" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Пормяна на мащаба и предвижване по картата" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2261,10 +2255,10 @@ "десния бутон на мишката" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Търсене..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2273,58 +2267,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Моля въведете филтър." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Моля, въведете низ за търсене." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "регулярен израз" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "замени селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "добави към селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "изтрий от селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "търсене в селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "чувствителност към регистъра" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "регулярен израз" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' и 'Street' в кой да е ключ или име." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' в кой да е ключ или име." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' където и да е в името." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - ключ 'type' със стойност именно 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2334,34 +2327,34 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - няма 'Bak' в името." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - ключ=foot, независимо от стойността." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Специални цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" msgstr "тип: - тип на обекта (възел, път, връзка)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - всички обекти, променени от зададения потребител" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - обект с дадено ID (0 за нови обекти)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - обекти с дадено количество възели / точки" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2369,37 +2362,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - всички променени обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - всички избрани обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - всички непълни обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - всички немаркирани обекти" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child израз - всички обекти наследници, отговарящи на израза" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child израз - всички обекти наследници, отговарящи на израза" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent израз - всички родители на обектите отговарящи на израза" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent израз - всички родители на обектите отговарящи на израза" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "Използвайте | или OR за да обедините в логическо \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2407,9 +2400,9 @@ "ключ съдържа двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Използвайте ( и ) за да групирате изрази" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2419,51 +2412,51 @@ msgstr "Филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Приемане на филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Стартиране търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Не е намерено съвпадение за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Намерени са {0} съвпадения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2481,5 +2474,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2487,10 +2480,10 @@ "ключ=стойност." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Синтактична грешка: Шаблонът {0} в {1} е недопустим!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2499,26 +2492,26 @@ "връзка." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Неочакван знак: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Липсват параметри за \"ИЛИ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Липсват параметри за \"НЕ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Липсва затваряща скоба." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2527,9 +2520,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Грешен брой параметри на оператора за точки." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2540,5 +2533,5 @@ "числова стойност, възел или диапазон, например, 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2642,7 +2635,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2754,5 +2747,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Двоен конфликт" @@ -2777,5 +2770,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2783,6 +2776,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2853,18 +2846,8 @@ msgstr "Потвърждение за изтриване" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Разрешаване на конфликтите в изтрито състояние в {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2899,10 +2882,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Разрешаване на конфликтите в списъка с членове на връзката {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2937,20 +2920,20 @@ msgstr "Последователност" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Разрешаване {0} конфликтиращи маркери във възел {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Разрешаване {0} конфликтиращи маркери в път {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Разрешаване {0} конфликтиращи маркери в релация {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2972,10 +2955,10 @@ msgstr "Разрешаване на конфликт на версиите за релация {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Разрешаване на конфликт във възлите на път {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3019,5 +3002,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Нова стойност" @@ -3064,7 +3047,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3073,10 +3056,10 @@ msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Грешка в конфигурационния файл на линии {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3087,5 +3070,5 @@ "предпочитания ''{0}'' не е директория." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3094,5 +3077,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3103,5 +3086,5 @@ "на липсваща директория за параметри: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3112,5 +3095,5 @@ "липсваща директория за параметри: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3118,5 +3101,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3125,5 +3108,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3132,5 +3115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3139,5 +3122,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3146,10 +3129,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3232,25 +3215,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "Ю" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "С" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "З" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "И" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3258,5 +3241,5 @@ msgstr "Списък с промени {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3264,5 +3247,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3272,26 +3255,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Липсват параметри за \"НЕ\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "Историята на отношение {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3300,5 +3283,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3361,24 +3344,24 @@ msgstr "С" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Очакваше се ID >= 0. Имаме: {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "Примитив с ID = 0 не може да бъде невидим." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "Очаква се ID > 0. Имаме {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "Очакваше се Version > 0. Имаме: {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3386,5 +3369,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3412,10 +3395,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3426,7 +3409,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3445,7 +3428,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "невъзможно сравняването на примитивите с ID=''{0}'' и ID=''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3580,10 +3563,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Грешка: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3595,6 +3578,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3604,5 +3587,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3612,6 +3595,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3629,6 +3612,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "фон" @@ -3646,25 +3629,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"ВАЖНО : данните са позиционирани прекалено далеч \n" -"от границите на текущата Ламбертова зона.\n" -"Не качвайте на сървъра никакви данни след\n" -"това съобщение. Върнете назад последното \n" -"си действие, съхранете вашата работа и\n" -"започнете нов слой в новата зона." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Ламбертова зона" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3678,27 +3672,56 @@ msgstr "Проекция Меркатор" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Зона" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Швейцарска Мрежа (Швейцария)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3714,10 +3737,10 @@ msgstr "Отметката не може да бъде записана.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Да не се показва повече" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3725,32 +3748,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "непълен" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "път / магистрала" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "железопътна линия" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "водоеми" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "земеползване" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3759,5 +3782,5 @@ msgstr[1] "{0} точки" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3795,6 +3818,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Конфликт" @@ -3804,11 +3827,11 @@ msgstr "Неизвестен хост" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Обектът е изтрит" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4012,11 +4035,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4131,5 +4154,5 @@ msgstr "Дължина на новосъздавания линеен сегмент." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4137,18 +4160,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(няма обект)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Потребител:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "слоя не е в списъка." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4270,67 +4293,67 @@ msgstr "роля {0} не участва в двойката за сравнение {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Настройки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Маркери" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Възли" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Членове" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Няма чакащи tag конфликти за разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags({0} конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} чакащи tag конфликти за разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Възли(решени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Възли(с конфликт)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Членове (разрешени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4338,68 +4361,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Членове (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Няма чакащи конфликти на характеристиките" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Характеристики (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Чакащи за разрешаване конфликти на характеристики" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Разрешение на конфликт" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "списъкът в роля {0} понастоящем не участва в двойка за сравнение" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "точка {0} не е открита в списъка" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "заключване на скролирането" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Сравняване " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Моя версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4407,5 +4430,5 @@ msgstr "Обединена версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4415,30 +4438,30 @@ "приложат решенията за обединяване." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Тяхна версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> горе" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> долу" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4446,5 +4469,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4452,14 +4475,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4467,5 +4490,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4473,55 +4496,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Нагоре" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Преместване нагоре на избраните елементи с една позиция" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Надолу" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Преместване на избраните елементи надолу с една позиция" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Премахни" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Фиксиране" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Фиксиране на текущия списък обединени елементи" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Освобождаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" "Освобождаване на списъка обединени елементи и стартиране на обединяването" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4530,5 +4553,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4537,5 +4560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4544,5 +4567,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4551,5 +4574,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4558,6 +4581,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4566,6 +4589,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4576,5 +4599,5 @@ msgstr "Възел" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4586,5 +4609,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4593,19 +4616,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Връзката със сървъра пропадна" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Да, възстанови от изтриване също" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Не, отказване на операцията" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4616,9 +4639,9 @@ "сървъра.

Желаете ли да възстановим и тези възли също?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Възстановяване на изтрити допълнителни възли?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4630,5 +4653,5 @@ "изтрити на сървъра.

Желаете ли да ги възстановим и тях също?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Възстановяване след изтриване на свързани примитиви?" @@ -4652,84 +4675,84 @@ msgstr "Координати:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Изтрито състояние:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Видимо състояние:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(никой)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "изтрито" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "не е изтрито" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "видимо (на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "не е видимо (на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Запазване копие на местната версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Физическо изтриване от местната база данни" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Запазване на моите координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Запазване на техните координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Да, нулирай ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Не, изход" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4739,17 +4762,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Нулирай ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Запазване на тяхното видимо състояние" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Да, изчисти го!" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4760,9 +4783,9 @@ "базата данни.
Съгласни ли сте?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Премахни от базата данни" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4777,19 +4800,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<неопределено>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4805,10 +4828,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4818,10 +4841,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4848,27 +4871,27 @@ msgstr "Тяхна версия (база данни на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4893,22 +4916,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Приложи" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4916,5 +4939,5 @@ msgstr "няма/никой" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5005,6 +5028,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5015,5 +5038,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5027,21 +5050,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -5049,5 +5072,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Роля:" @@ -5134,10 +5157,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5157,17 +5180,17 @@ msgstr "Списък промени: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "Отваряне диалог за сливане на избраните обекти от горния списък." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5176,25 +5199,25 @@ msgstr "Изберете на картата всички обекти, избрани в списъка по-горе." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Прекъсни разрешаване на кофликти и затвори диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Прилагане на разрешените конфликти и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Прилагане на резолюцията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Затваряне въпреки всичко" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Продължаване разрешаването на кофликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5206,13 +5229,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Конфликтът не е разрешен напълно" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5224,8 +5247,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5292,5 +5315,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5322,34 +5345,34 @@ msgstr "Отваряне списъка с всички заредени слоеве." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Изтриване избрания слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Показване/скриване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Превключване видимостта на избрания слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Активиране" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Активиране на избрания слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Обедини този слой с друг слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Преместване избрания слой един ред нагоре." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Преместване избрания слой един ред надолу." @@ -5359,18 +5382,17 @@ msgstr "Информация за слоя" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Това ще промени до {0} обект." -msgstr[1] "Това ще промени до {0} обекта" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Празна стойност изтрива ключа." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5379,10 +5401,10 @@ msgstr "<различни>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Промени стойностите?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5391,5 +5413,5 @@ msgstr[1] "Промяна параметрите на {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5398,9 +5420,9 @@ msgstr[1] "Това ще промени до {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Моля, изберете ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Изберете стойност" @@ -5424,102 +5446,98 @@ msgstr "Член на" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Добавяне на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Свойства: {0} / Членство: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Параметри / Отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Промяна на връзка" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Изтриване от връзка" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Изваждане на избраните обекти от релация {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Изтриване на избрания ключ за всички обекти" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Изтриване на параметри" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Добавяне на нова двойка ключ/стойност за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Редактиране на параметри" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Редактиране стойността на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Свойства: {0} / Членство: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Параметри / Отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Промяна на връзка" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Изтриване от връзка" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Изваждане на избраните обекти от релация {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Изтриване на избрания ключ за всички обекти" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Изтриване на параметри" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Връзки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Отваряне списъка с всички релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Връзки: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Редактиране на релацията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Изтриване на избраната връзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Създаване на нова релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5548,5 +5566,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5558,9 +5576,9 @@ msgstr "Избрано: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Отсъедини панела" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5569,5 +5587,5 @@ "левия панел." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела" @@ -5648,12 +5666,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Свали членовете на връзките" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Конфликт в данните" @@ -5673,5 +5691,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5679,5 +5697,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5685,18 +5703,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Етикети и членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Родителски релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Подчинени релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5705,14 +5723,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5722,9 +5740,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5734,15 +5752,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5750,5 +5768,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5756,20 +5774,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Редактор на отношения: Премахване на избраното" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5778,66 +5796,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Сортиране на членовете на връзката" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Редактор на връзки: Сортиране" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Преместване на текущо избраните членове нагоре" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Редактор на връзки: Преместване нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Редактор на връзки: Преместване надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Премахване на текущо избраните членове от тази връзка" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Редактор на връзки: Премахване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Изтриване на текущо редактираната врзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Да, създай конфликт и затвори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "Не, продължава редактирането" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5846,9 +5864,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Конфликт в данните" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5857,41 +5875,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Прилагане на обновяването и затваряне на прозореца." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Добави празен етикет" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Сваляне всички непълни пътища и възли от връката" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Редактор на връзки: Сваляне на членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Установява роля за избраните членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Приложи роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5901,19 +5919,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Да, приложи го!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "Не, не прилагай!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Потвърди празна роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Сваляне на връзка {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5923,7 +5948,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "Премахване на текущо избраните членове от тази връзка" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -5935,12 +5959,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Отнася се за" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Свързано" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 msgid "Download referring relations" @@ -5952,5 +5972,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6020,9 +6040,9 @@ msgstr "Отметки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6031,52 +6051,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "мин. ширина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "мин. дължина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "макс. ширина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "макс. дължина" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6086,52 +6106,52 @@ "за сваляне)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Рамка" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Източници и типове данни" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap данни" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Изходни GPS данни" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Свали като нов слой" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6139,18 +6159,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Област за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Сваляне" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -6158,21 +6178,21 @@ "обработка на заявката." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Областта за сваляне е ОК, размерът е приемлив за сървъра." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6194,21 +6214,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Грешка! Възможно е да липсват маркери (тагове)." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6947,8 +6967,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7121,5 +7141,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7131,5 +7151,5 @@ msgstr "Тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7176,5 +7196,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7188,5 +7208,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7197,5 +7217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7204,19 +7224,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7226,32 +7246,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7273,5 +7293,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7333,12 +7353,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7363,33 +7383,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Възел {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Показване на проблема" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Зареди историята" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Път {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7398,7 +7416,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Сортиране меню шаблони" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7416,7 +7433,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7456,7 +7472,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Анонимно" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7484,17 +7499,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Версия {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "изтрито" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Версия {0} създадена на {1} от {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7548,10 +7562,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7763,5 +7777,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7784,17 +7798,17 @@ msgstr "Слой / Ниво" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Трябва ли да бъде качено?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7810,7 +7824,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7853,29 +7867,29 @@ msgstr[1] "{0} обекта за изтриване:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Качване на промени" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Качване на променените примитиви" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "Невалиден коментар на заявката за качване" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Прекъсване на качването и продължаване с редактирането" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Качване на всички промени в една заявка" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7885,39 +7899,39 @@ "на заявка за всяка променена примитива" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Опишете измененията на качваните от вас данни:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" "Отваряне на нов списък с промени и използването му при следващо качване" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Качване на данните към вече отворен списък с промени" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Затваряне на списъка с промени след качване" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7925,16 +7939,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7978,24 +7992,24 @@ msgstr "Продължаване на качването" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Изображения за {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Прочитане GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Не е указано време за точка {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8003,33 +8017,33 @@ msgstr "Четене {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Не е намерено изображение с информация за времето." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Изображения с данни за местоположение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS Начало: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS Край: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "текуща разлика: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "разлика в часови пояси: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8038,14 +8052,14 @@ msgstr[1] "изображения" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} в пределите на следата" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Синхронизация часовник" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8053,32 +8067,32 @@ msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Невъзможно е да се прочете датата от файла \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Липсва EXIF време във файла \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Часова зона на GPS устойството (разлика със снимките)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизиране времето с GPS приемника" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Въведенето време не може да бъде използвано." @@ -8168,5 +8182,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8218,10 +8232,10 @@ msgstr[1] "{0} точки на интерес" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Преобразувай в слой данни" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8231,11 +8245,11 @@ "
Ако искате да качвате следи, погледнете тук:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8245,29 +8259,29 @@ msgstr "Преобразувано от: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Свали от OSM по дължина на тази следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Свали всичко в пределите на:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} метри" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Максимална област за една заявка:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8278,9 +8292,9 @@ "Продължаване?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Няма GPX следа в слоя за да асоциираме звук с нея." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8290,5 +8304,5 @@ "са пропуснати или преместени в началото." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8298,23 +8312,23 @@ "смислено да се предположи тяхното време, бяха пропуснати." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Слой Данни {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "извън областта за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8323,5 +8337,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8335,5 +8349,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8346,11 +8360,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8359,22 +8373,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "неустановена" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Преобразувай в слой GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Не е намерен път \"от\"." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8474,9 +8501,9 @@ "Няма съществуващи аудио маркери в този слой, спрямо които да се отмести." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Показване/скирване на Текст/Икони" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Превключване видимостта на маркер текста и икони." @@ -8543,5 +8570,5 @@ "Стойност по подразбиране неизвестна (настройката все още не е използвана)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8549,5 +8576,5 @@ msgstr "Моля, изберете ред за редактиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8555,5 +8582,5 @@ msgstr "Нова стойност за {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8562,5 +8589,5 @@ msgstr "Моля, изберете ред за изтриване." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Въведете нова двойка ключ/стойност" @@ -8699,40 +8726,40 @@ msgstr "Калибровка на звукозаписа" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Цвят" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Стил на изобразяване {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Слой: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Изберете" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Изберете цвят за {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Задай по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Задай всички да са по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Цветове, използвани от различни обекти в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Цветове" @@ -9181,17 +9208,17 @@ "Трябва да рестартирате JOSM, за да може изменените настройки да подействат." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Показвай координатите като" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Метод на проекция" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9201,5 +9228,5 @@ msgstr "Картографска проекция" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9258,81 +9285,81 @@ msgstr "Бърз клавиш" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Автор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Страница: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9341,6 +9368,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9534,10 +9561,10 @@ msgstr "Група модификатори" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "<няколко>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9547,13 +9574,13 @@ msgstr[1] "Премахване на стари ключове от {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Добавяне на нов етикет" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9561,18 +9588,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Незадължителни Атрибути:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "затворен път" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестен тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9583,15 +9610,15 @@ msgstr "Не може да се прочете източник на шаблони за маркиране: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Грешка при разбор {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Елементи от тип {0} се поддържат." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9601,18 +9628,18 @@ msgstr[1] "Промяна {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Нищо не е избрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Селекцията е неподходяща!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Прилагане шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Промяна параметри" @@ -9628,6 +9655,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9636,8 +9663,21 @@ msgstr "Свързване с OSM Сървър..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Зареждане точки {0} до {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9754,11 +9794,11 @@ msgstr "Непознат режим {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9768,40 +9808,40 @@ msgstr "Сваляне данни от OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9866,5 +9906,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9877,66 +9917,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Създаване на списък с промени ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Успешно отворен списък с промени {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Обновяване списъка с промени ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Затваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Няма съществуващ набор промени за качване на разлики" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Подготвяне…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Качване..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Изчакване 10 секунди " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "ОК - нов опит" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9971,5 +10011,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9996,5 +10036,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10002,5 +10042,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10013,5 +10053,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10164,5 +10204,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10171,19 +10211,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10191,20 +10231,20 @@ "." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10212,19 +10252,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Непълна спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Недопустим обект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10234,10 +10274,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10247,25 +10285,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10732,5 +10770,5 @@ msgstr "(Текста вече е кипиран в буфера за обмен на данни)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10742,12 +10780,5 @@ "Интернет." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10757,5 +10788,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10765,10 +10796,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10777,5 +10803,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10784,5 +10810,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10791,9 +10817,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10803,5 +10836,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10810,5 +10843,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10817,5 +10850,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10824,10 +10857,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10836,10 +10869,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10850,5 +10883,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10858,5 +10891,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11589,5 +11622,5 @@ msgstr "Грешка във файла {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11600,29 +11633,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Грешка при зареждане на файла" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Ламбертова зона 1 кеш файл (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Ламбертова зона 1 кеш файл (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Ламбертова зона 2 кеш файл (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Ламбертова зона 3 кеш файл (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Ламбертова зона 4 кеш файл (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11651,13 +11704,13 @@ msgstr "Избери от..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Кадастър" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Авто-определяне източници" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11666,13 +11719,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11967,43 +12020,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Зона" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Ламбертова зона" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Зареждане на местоположението от кеша (само ако той е включен)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Промяна местоположение" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Посочете ново местоположения за следващата заявка" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Добавяне на нов слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Местоположение" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12013,5 +12072,5 @@ "пунктуацията известни от www.cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Добавяне на нов слой" @@ -12042,5 +12101,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Настройка на WMS" @@ -12070,5 +12129,5 @@ "един от тях първо, после опитайте отново." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12076,28 +12135,28 @@ msgstr "Празен слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Не е векоторизиран." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "Размер на растера: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Векторизиран." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Комуна bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12108,25 +12167,16 @@ "Моля, създайте нов кеш." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Грешка на кеш формата" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Грешка в кеширането на Ламбертовата зона" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13186,20 +13236,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Желаете ли да разрешите това?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Потвърждение на действието на дистанционното управление" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13323,13 +13373,9 @@ msgstr "Намаляне на мащаба" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Изчистване на кеша" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "изображение " @@ -13917,6 +13963,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Неподредени брегови линии" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14575,12 +14622,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Сваляне" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Сваляне на картографски данни от OSM сървър." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14596,9 +14641,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Няма слоеве към които слоя източник
''{0}''.
би могъл да се " -"обедини." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14620,7 +14663,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Изтриване на повтарящи се точки..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14686,29 +14728,29 @@ msgstr "Невалиден URL на WMS или ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Настройте позицията на избрания WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Изберете WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Начало на подравняването" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14717,5 +14759,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14723,10 +14765,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14741,24 +14783,24 @@ msgstr "Автоматично сваляне" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS слой ({0}), сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14773,13 +14815,13 @@ "WMS въпреки всичко?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Да, дръпни изображенията" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "Невалиден URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14788,44 +14830,49 @@ "разделителната способност." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Сваляне на видимите квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Смяна разделителна способност" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Презареждане грешни квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Алфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Запис на WMS слоя във файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Запис на слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Зареждане на WMS слой от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Четене на WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Грешка във формата на файла" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Отметки" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27175,8 +27222,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "необичайна комбимация маркери" @@ -27196,34 +27242,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE Карти" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Карти (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27233,9 +27268,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Улици NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27249,46 +27287,131 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Не може да се търси защото няма заредени данни" - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Няма примитив с версия {0} в тази история" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "Няма валидна версия от дата ''{0}'' в тази история" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "няма намерена по-ранна версия. Историята е празна." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "няма намерена последна версия. Историята е празна." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Не е намерен примитив с id = {0} в тази база данни" - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни" - -#~ msgid "Reached the end of the line" -#~ msgstr "Достигнат е краят на реда" - -#~ msgid "help" -#~ msgstr "помощ" - -#~ msgid "Help / About" -#~ msgstr "Помощ / За модула" - -#~ msgid "WMS Plugin Help" -#~ msgstr "Помощ за модула WMS" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE Карти" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Карти (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Ламбертова зона 2 кеш файл (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Ламбертова зона 3 кеш файл (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Ламбертова зона 4 кеш файл (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Ламбертова зона 2 кеш файл (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Ламбертова зона 3 кеш файл (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Ламбертова зона 4 кеш файл (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Ламбертова зона 1 кеш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Ламбертова зона 1 кеш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Ламбертова зона 1 кеш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Ламбертова зона 1 кеш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Ламбертова зона 1 кеш файл (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "ВАЖНО : данните са позиционирани прекалено далеч \n" +#~ "от границите на текущата Ламбертова зона.\n" +#~ "Не качвайте на сървъра никакви данни след\n" +#~ "това съобщение. Върнете назад последното \n" +#~ "си действие, съхранете вашата работа и\n" +#~ "започнете нов слой в новата зона." + +#~ msgid "Edit Properties" +#~ msgstr "Редактиране на параметри" + +#~ msgid "Linked" +#~ msgstr "Свързано" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -27514,4 +27637,13 @@ #~ msgid "Navigation" #~ msgstr "Навигация" + +#~ msgid "Help / About" +#~ msgstr "Помощ / За модула" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Помощ за модула WMS" + +#~ msgid "help" +#~ msgstr "помощ" #~ msgid "" @@ -27836,9 +27968,4 @@ #~ msgstr "Избор на Tableau d'Assemblage" -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}" - #~ msgid "Validate either current selection or complete dataset." #~ msgstr "Проверяване на избранато или всички данни." @@ -28072,4 +28199,7 @@ #~ msgstr "Възникна грешка при записа. Грешката е: {0}" +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Не може да се търси защото няма заредени данни" + #~ msgid "removing reference from way {0}" #~ msgstr "премахване на справка от път {0}" @@ -28108,4 +28238,7 @@ #~ msgid "relations" #~ msgstr "връзки" + +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни" #~ msgid "Use a new changeset and close it" @@ -28130,4 +28263,7 @@ #~ "отворен." +#~ msgid "Reached the end of the line" +#~ msgstr "Достигнат е краят на реда" + #~ msgid "No currently open changeset. Opening a new changeset..." #~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..." @@ -28158,4 +28294,7 @@ #~ "или на вашият език." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Не е намерен примитив с id = {0} в тази база данни" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "" @@ -28172,4 +28311,16 @@ #~ msgstr "неочаквана върната стойност {0}" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Няма примитив с версия {0} в тази история" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Няма валидна версия от дата ''{0}'' в тази история" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "няма намерена по-ранна версия. Историята е празна." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "няма намерена последна версия. Историята е празна." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "индекс извън границите. Имаме: {0}" Index: applications/editors/josm/i18n/po/cs.po =================================================================== --- applications/editors/josm/i18n/po/cs.po (revision 18772) +++ applications/editors/josm/i18n/po/cs.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-13 19:43+0000\n" -"Last-Translator: Jezevec \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-18 06:21+0000\n" +"Last-Translator: marin \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorují se nekorektní URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Varování" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoruji poškozený soubor z URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Nelze přečíst soubor ''{0}''.
Chyba:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Nelze přečíst soubor ''{0}''.
Chyba:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Chyba" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -302,5 +303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -309,27 +310,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -347,5 +348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Zrušit" @@ -355,19 +356,19 @@ msgstr "Prosím, vyberte alespoň jeden již nahraný uzel, cestu nebo relaci." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Prosím vyberte cílovou vrstvu." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Vybrat cílovou vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Sloučit" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -378,5 +379,5 @@ "být sloučeny." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Žádné cílové vrstvy" @@ -489,13 +490,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -593,20 +594,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Soubor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Nejsou otevřené žádné sady změn" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Žádné otevřené sady změn" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -644,10 +645,10 @@ msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Kombinovat {0} cesty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Prosím zvolte minimálně dvě cesty ke spojení" @@ -692,10 +693,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -714,11 +715,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Přepsat" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Soubor již existuje. Chcete jej přepsat ?" @@ -765,5 +766,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -772,6 +773,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -787,7 +788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -815,5 +815,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplikovat" @@ -837,30 +837,30 @@ msgstr "Ukončit JOSM" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Všechny formáty" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportovat do GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportovat data do GPX souboru." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nic nevyexportováno. Nejdříve stáhněte data." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -868,13 +868,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -893,8 +893,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -902,7 +902,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -925,9 +925,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -939,5 +939,5 @@ msgstr "parametr ''{0}'' nesmí být null" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -947,5 +947,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Export GPX souboru" @@ -1091,6 +1091,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nový" @@ -1161,5 +1161,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" +msgstr "Stáhnout data" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 @@ -1219,5 +1219,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Vložit" @@ -1307,11 +1307,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Uložit" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Uložit aktuální data." @@ -1368,10 +1368,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Uložit jako..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Uložit aktuální data do nového souboru" @@ -1390,10 +1390,10 @@ "objekty." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Zobrazit zprávu o stavu" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1401,20 +1401,20 @@ "chybovému hlášení" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Nápověda: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Zpráva o stavu" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Zkopírovat do schránky a zavřít" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1584,5 +1584,5 @@ msgstr "Nespojený uzel" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1590,5 +1590,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1635,55 +1635,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Stahuji data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Nenalezena aktuální datová sada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "V aktuální datové sadě není prvek s id {0}" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Aktualizovat vybrané" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Aktualizovat výběr" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Nejsou vybrány žádné prvky pro aktualizaci." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Prázdný výběr" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Smazat objekty" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Nahrát data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1694,5 +1691,5 @@ "konflikty vyřešeny." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1700,29 +1697,29 @@ msgstr "Žádné změny k nahrání." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Synchronizovat pouze bod {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Synchronizovat pouze cestu {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Syncronizovat pouze relaci {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synchronizovat celý dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1743,11 +1740,11 @@ "pro přerušení a pokračování editace.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Objeveny konflikty" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1763,5 +1760,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1774,22 +1771,22 @@ "sadou změn." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Sada změn byla uzavřena" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1800,19 +1797,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "Bod je stále využit" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Aktualizuji prvky" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1821,5 +1818,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1830,15 +1827,15 @@ "opakuji nahrávání." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "Objekt ''{0}'' je již smazán. Přeskakuji objekt při nahrávání." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "Nahrávám {0} objektů ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1950,17 +1947,17 @@ msgstr "Zpomalené přehrávání" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Stahuji GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Stažená GPX data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Stahuji data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1969,5 +1966,5 @@ "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "V této oblasti nebyla nalezena žádná data." @@ -2026,9 +2023,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Chyby při stahování" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "Chyby během stahování" @@ -2046,5 +2043,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2052,5 +2049,5 @@ msgstr "Režim: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2148,7 +2145,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Nakreslete obdélník požadované velikosti a pak pusťte myší tlačítko." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2157,9 +2153,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Táhni segmentem cesty a vytvoř obdelník." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2171,5 +2166,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2190,17 +2185,17 @@ msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Přesun prvků" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Přesunout je" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Vrátit zpět přesun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2213,13 +2208,13 @@ "Opravdu přesunout?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Vždy přesunout a tento dialog již více nezobrazovat" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2227,9 +2222,9 @@ "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Pusťte myší tlačítko k zastavení otaáčení" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2239,15 +2234,15 @@ "přidání/odebrání); Shift-Ctrl pro otáčení výběrem" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zvětšení" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Přiblížení a pohyb mapy" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2257,10 +2252,10 @@ "nahoru dolu doleva doprava; pohyb se zoomem možno též pravým tlačítkem myši" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Hledat..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2269,60 +2264,59 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Prosím zadejte řetězec filtru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Zadjte hledaný řetězec." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regulární výraz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "nahradit označené" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "přidat k výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "odebrat z výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "Najít ve výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "velikost písmen rozhoduje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regulární výraz" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Baker Street - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' v jakémkoliv klíči nebo jménu." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' v jakémkoliv klíči nebo jménu." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' kdekoliv ve jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - klíč 'type' s hodnotou přesně 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2332,34 +2326,34 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - neobsahuje 'Bak' ve jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - klíč 'foot' nastavený na jakoukoliv hodnotu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Speciální cíle:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - typ objektu (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - všechny objekty změněné uživatelem" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt s daným ID (0 pro nové objekty)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt s daným počtem uzlů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2367,46 +2361,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - všechny změněné objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - všechny vybrané objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - všechny nekompletní objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - všechny objekty bez tagů" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child výraz - všechny podobjekty objektů odpovídajících výrazu" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child výraz - všechny podobjekty objektů odpovídajících výrazu" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent výraz - všechny rodiče objektů odpovídajících výrazu" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent výraz - všechny rodiče objektů odpovídajících výrazu" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "Použijte | nebo OR ke kombinaci s logickým \"nebo\"" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Použijte \" jako uvozovky (například pokud klíč obsahuje dvojtečku)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Použijte \" jako uvozovky (například pokud klíč obsahuje dvojtečku)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "Použijte ( a ) k seskupení výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2416,51 +2410,51 @@ msgstr "Filtrovat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Hledat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Přidat filtr" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Začít hledání" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Nebyly nalezeny záznamy pro \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Ve výběru se nenašlo nic při hledání ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Nalezeno {0} odpovídajích výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2477,40 +2471,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Neočekávaný token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Chybějící argument pro \"NEBO\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Chybějící argument pro \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Očekávám uzavírací závorku." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2519,9 +2513,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Chybný počet parametrů pro operátor nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2532,5 +2526,5 @@ "čísel, například nodes:10-20." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2634,7 +2628,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2745,5 +2739,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Dvojí konflikt" @@ -2770,5 +2764,5 @@ msgstr "Nelze vzít zpět příkaz ''{0}'' protože vrstva ''{1}'' již neexistuje" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2776,6 +2770,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "nemohu vyřešit nerozhodnutý konflikt" @@ -2849,18 +2843,8 @@ msgstr "Potvrďte smazání" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Vyřešení konfliktu ve stavu smazání pro {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2896,10 +2880,10 @@ msgstr "Odstraňování odkazu z relace {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Vyřešit konflikty v seznamu členů relace {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2933,20 +2917,20 @@ msgstr "Sekvence" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Vyřešení {0} konfliktů tagů v uzlu {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Vyřešení {0} konfliktů tagů v cestě {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Vyřešení {0} konfliktů tagů v relaci {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2968,10 +2952,10 @@ msgstr "Vyřešení konfliktu verzí relace {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Vyřešit konflikty v seznamu bodů cesty {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3015,5 +2999,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nová hodnota" @@ -3060,7 +3044,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3069,10 +3053,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Poškozený konfigurační soubor na řádku {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3083,5 +3067,5 @@ "adresářem." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3090,5 +3074,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3097,5 +3081,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3104,5 +3088,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3110,5 +3094,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3117,5 +3101,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3124,5 +3108,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3131,5 +3115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3138,10 +3122,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3225,25 +3209,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3251,5 +3235,5 @@ msgstr "Sada změn {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3257,5 +3241,5 @@ msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3265,26 +3249,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Chybějící argument pro \"NOT\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "Historie pro relaci {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3293,6 +3277,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3300,7 +3284,4 @@ "Keeping target object. " msgstr "" -"Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší " -"verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám můj " -"prvek. " #. translators notes must be in front @@ -3357,24 +3338,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "očekáváno id >= 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "objekt s id=0 nemůže být neviditelný" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "očekáváno id > 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "očekávána verze > 0. Nalezena {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3382,5 +3363,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3408,10 +3389,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3422,7 +3403,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3441,7 +3422,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3576,10 +3557,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3591,6 +3572,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3601,5 +3582,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3610,6 +3591,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3628,6 +3609,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "pozadí" @@ -3645,25 +3626,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"UPOZORNĚNÍ: data umístěna příliš daleko \n" -"od současných hranic zóny Lambertovy kartografické projekce.\n" -"Neposílejte na server žádná data od této hlášky.\n" -"Vraťte zpět poslední akci, uložte svou práci\n" -"a vytvořte novou vrstvu v JOSM s novou zónou Lambertovy \n" -"kartografické projekce.." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "Lambertova zóna 4 (Francie)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambertova zóna" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "Lambertova zóna CC9 (Francie)" @@ -3677,27 +3669,56 @@ msgstr "Mercatorova projekce" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zóna UTM" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Švýcarský Grid" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "Zóna UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3711,10 +3732,10 @@ msgstr "Záložku nelze uložit.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Znovu nezobrazovat" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3722,32 +3743,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "nekompletní" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "silnice" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "železnice" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vodní tok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "využití oblasti (landuse)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3757,5 +3778,5 @@ msgstr[2] "{0} uzlů" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3794,6 +3815,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Konflikt" @@ -3803,11 +3824,11 @@ msgstr "Neznámé jméno počítače" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Objekt smazán" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4015,11 +4036,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4134,5 +4155,5 @@ msgstr "Délka nového nakresleného segmentu trasy." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4140,18 +4161,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(žádný objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Uživatel:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "vrstva není v seznamu" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4279,67 +4300,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Členové" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Nezbývají žádné další konflikty značek k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Značky({0} konfliktů)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "Zbývá {0} konfliktů značek k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Body(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Body(s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Nevyřešené konflikty v seznamu bodů v této cesty" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Členové(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4347,68 +4368,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Členi (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyřešené konflikty v seznamu členů této relace" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Nezbývají žádné konflikty ve vlastnostech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Zbývající konflikty k vyřešení ve vlastnostech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Řešení konfliktů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "aktuální parametr je mimo rozsah: zadáno {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "položka {0} nenalezena v seznamu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Porovnat " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Má verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Seznam prvků v mé datové sadě, např v lokální datové sadě" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4416,5 +4437,5 @@ msgstr "Sloučená verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4422,30 +4443,30 @@ msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Cizí verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Seznam prvků v cizí datové sadě, např v serverové datové sadě" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> vrchol" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Kopírovat mé vybrané body na začátek seznamu slučovaných bodů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> spodek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4453,5 +4474,5 @@ msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4461,5 +4482,5 @@ "elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4467,9 +4488,9 @@ "Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4479,5 +4500,5 @@ "elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4487,54 +4508,54 @@ "elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Nahoru" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Posunout vybrané elementy o jednu pozici nahoru" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Dolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Posunout vybrané elementy o jednu pozici dolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Odstranit" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Blokovat" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Blokovat aktuání seznam slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Odblokovat" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Odblokovat aktuání seznam slučovaných elementů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4545,5 +4566,5 @@ "položek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4554,5 +4575,5 @@ "položek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4562,5 +4583,5 @@ msgstr[2] "Má verze ({0} položek)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4570,5 +4591,5 @@ msgstr[2] "Sloučená verze ({0} položek)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4578,6 +4599,6 @@ msgstr[2] "Cizí verze ({0} položek)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4588,6 +4609,6 @@ "nastavení synchronizácie." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4598,5 +4619,5 @@ msgstr "Bod" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4608,5 +4629,5 @@ msgstr "neočekávaný index sloupce. Zadáno {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4615,19 +4636,19 @@ msgstr "Při komunikaci se serverem doslo k chybě
Detaily: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Komunikace se serverem selhala" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Ano, obnovit je také" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Ne, zruš operaci" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4638,9 +4659,9 @@ "serveru.

Chcete obnovit také tyto body?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Obnovit další body?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4652,5 +4673,5 @@ "na serveru.

Chcete je obnovit také?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Obnovit závislé prvky?" @@ -4676,84 +4697,84 @@ msgstr "Souřadnice:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Stav smazáno:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Stav viditelné:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(žádný)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "smazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "nesmazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "viditelný (na serveru)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "neviditelný (na serveru)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Ponechat klon lokální verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Fyzicky odstranit z lokální datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Ponechat mé souřadnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Ponechat cizí souřadnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Nerozhodnutý konflikt rozdílných souřadnic" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Ponechat můj stav vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Ponechat cizí stav vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Nerozhodnutý konflikt stavu vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Ponechat můj stav viditelné" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Ano, resetovat id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Ne, zrušit" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4763,17 +4784,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Resetovat id na 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Ponechat cizí stav viditelné" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Ano, vyčistit to" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4784,9 +4805,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Odstranit z datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Nerozhodnutý konflikt stavu viditelné" @@ -4801,19 +4822,19 @@ msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4829,10 +4850,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4842,10 +4863,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4872,27 +4893,27 @@ msgstr "Cizí verze (serverová datová sada)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Ponechat vybrané páry klíč/hodnota z lokální datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Ponechat vybrané páry klíč/hodnota ze serverové datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Nerozhodnuto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Označit vybrané tagy jako nerozhodnuté" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4917,22 +4938,22 @@ msgstr "Žádné konflikty k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Zrušit řešení konfliktů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Aplikovat vyřešené konflikty" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4940,5 +4961,5 @@ msgstr "nic" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5030,6 +5051,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5041,5 +5062,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5054,21 +5075,21 @@ msgstr "Pozice {0} je mimo rozsah. Aktuální počet členů je {1}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "Odstranit tohoto člena z relace" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 msgid "Keep" msgstr "Ponechat" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "Zatím nerozhodnuto" @@ -5076,5 +5097,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Role:" @@ -5161,10 +5182,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5184,13 +5205,13 @@ msgstr "Zásobník příkazů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "Vyřešit konflikty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Vyřešit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5198,5 +5219,5 @@ "seznamu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5205,25 +5226,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Zrušit řešení konfliktu a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplikovat řešení konfliktů a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Aplikovat řešení" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Přesto zavřít" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Pokračovat v řešení" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5235,13 +5256,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Konflikt není vyřešen kompletně" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5253,8 +5274,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5321,5 +5342,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5351,34 +5372,34 @@ msgstr "Otevřít seznam všech nahraných vrstev." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Smazat označenou vrstvu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Zobrazit/Skrýt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Přepnout viditelnost zvolené vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Aktivovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Aktivovat vybranou vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Sloučit tuto vrstvu do jiné vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Přesunout zvolenou vrstvu o řádek nahoru." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Přesunout zvolenou vrstvu o řádek dolů." @@ -5388,19 +5409,17 @@ msgstr "Informace o vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Toto změní až {0} objekt." -msgstr[1] "Toto změní až {0} objekty." -msgstr[2] "Toto změní až {0} objektů." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Prázdná hodnota smaže klíč" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5409,10 +5428,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Změnit hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5422,5 +5441,5 @@ msgstr[2] "Změnit vlastnosti až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5430,9 +5449,9 @@ msgstr[2] "Toto změní až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Prosím zvolte klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" @@ -5456,102 +5475,98 @@ msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Přidat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Vlastnosti: {0} / Členství: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Vlastnosti / Členství" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Změnit relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Odstranit z relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Opravdu smazat výběr z relace {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Smaže zvolený klíč ve všech objektech" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Smazat vlastnosti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Přidat nový pár klíč/hodnota ke všem objektům" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Upravit vlastnosti" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Vlastnosti: {0} / Členství: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Vlastnosti / Členství" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Změnit relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Odstranit z relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Opravdu smazat výběr z relace {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Smaže zvolený klíč ve všech objektech" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Smazat vlastnosti" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Otevřít seznam všech relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relace: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Otevřít editor pro zvolenou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Smazat vybrané relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Vytvořit novou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvořit kopii relace a otevřít ji v novém okně" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "Nastavit aktuální výběr na seznam vybraných relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "Vybrat členy všech vybraných relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "Vybrat členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "Stáhnout všechny členy vybraných relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "Stáhnout členy" @@ -5580,5 +5595,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5590,9 +5605,9 @@ msgstr "Výběr: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Vytrhnout panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5601,5 +5616,5 @@ "nástrojů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Minimalizovat nebo maximalizovat obsah panelu" @@ -5683,12 +5698,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Stáhnout členy relace" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Konflikty v datech" @@ -5707,5 +5722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5713,5 +5728,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5720,18 +5735,18 @@ "Upozornění: ignoruji výjimku, protože úloha byla přerušena. Výjimka: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Značky a Členové" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Rodičovské relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Potomci relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5743,14 +5758,14 @@ "provést s touto cyklickou závislostí?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Odstranit, vyčistit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Ignorovat, ponechat relaci jak je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5762,9 +5777,9 @@ "''{0}''

Opravdu chcete přidat dalšího člena relace?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Více členů odkazuje na stejný prvek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5777,10 +5792,10 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5788,5 +5803,5 @@ "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5796,5 +5811,5 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5804,20 +5819,20 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Editor relací: Odstranit vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5826,66 +5841,66 @@ msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "Vybrat prvky pro vybrané členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Seřadit členy relace" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Editor relací: Třídění" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Přesunout zvolené členy nahoru" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Editor relací: Posun nahoru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Přesunout zvolené členy dolů" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Editor relací: Posun dolů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Odstranit vybrané členy z relace" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Editor relací: Odstranit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Smazat editovanou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Ano, vytvořit konflikt a zavřít" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "Ne, pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5894,9 +5909,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Konflikt v datech" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5905,41 +5920,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Aplikovat aktuální změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Aplikovat změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Zrušit změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Přidat prázdnou značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Stáhnout prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Editor relací: Stáhnout členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Nastaví roli pro vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Aplikovat roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5951,19 +5966,26 @@ "role těchto prvků.
Opravdu chcete novou roli aplikovat?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Ano, aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "Ne, neaplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Potvrdit prázdnou roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upravit relaci na kterou odkazuje vybraný člen" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Stahování relace {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5973,7 +5995,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "Zvětšit na prvek odkazovaný prvním členem výběru" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -5985,11 +6006,7 @@ msgstr "Zvětšování je neaktivní protože nebyl vybrán žádný člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Odkazuje na" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Spojený" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6002,5 +6019,5 @@ msgstr "očekáváno child.getId() >0. Nalezeno {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6070,9 +6087,9 @@ msgstr "Záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6081,53 +6098,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "Vytvořit záložku" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "Přidat záložku pro aktuální výběr stahované oblasti" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." msgstr "" "Aktuálně nemáte vybránu oblast pro stažení. Nejdříve prosím nějakou vyberte." + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." +msgstr "Zadejte prosím název záložky stahované oblasti." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "Zadejte prosím název záložky stahované oblasti." - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "Jméno lokace" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "Odstranit vybrané záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "Přejmenovat vybranou záložku" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min šíř." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min dél." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max šíř." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max dél." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6135,52 +6152,52 @@ msgstr "URL z www.openstreetmap.org (adresu můžete vložit do pole níže)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Ohraničující box" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "Hodnota zeměpisné šířky musí být v rozmezí [-90,90]." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "Hodnota zeměpisné délky musí být v rozmezí [-180,180]." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "Vložit URL ze schránky" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Zdroje a typy dat" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "Vybrat ke stažení dat z OSM ve vybrané oblasti." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Surová GPS data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "Vybrat pro stažení GPS tras ve vybrané oblasti." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Uložit jako novou vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6190,38 +6207,38 @@ "aktivní vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Stáhnout plochu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Stáhnout" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "Ještě není vybrána oblast" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Stahovaná plocha je moc velká, server zřejmě odmítne váš požadavek" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Stahovaná plocha je v pořádku, velikost akceptována serverem" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "Klikněte pro zavření dialogu a zrušení stahování" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "Klikněte pro stažení právě vybrané oblasti" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "Prosím vyberte nejprve oblast stahování." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6243,21 +6260,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící tagy." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "Hledat ..." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "Klikněte pro zahájení hledání míst" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "Dotazuji se jmeného serveru" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "Dotazuji se jmeného serveru ..." @@ -6996,8 +7013,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7170,5 +7187,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7180,5 +7197,5 @@ msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "Blízko" @@ -7228,5 +7245,5 @@ msgstr "JOSM prohlížeč nápovědy" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7246,5 +7263,5 @@ "jazyce ({1}) a v angličtině.

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7258,5 +7275,5 @@ "nepodařilo získat. Chybové hlášení (nepřeloženo):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7268,19 +7285,19 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "Nepodařilo se otevřít URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "Otevřít aktuální stránku nápovědy v externím prohlížeči" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "Upravit aktuální stránku nápovědy" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7292,32 +7309,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "Znovu načíst aktuální stránku nápovědy" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "Přejít na předchozí stránku" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "Přejít na následující stránku" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "Jít na domovskou stránku nápovědy pro JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 msgid "Failed to open help page. The target URL is empty." msgstr "Nepodařilo se otevřít stránku s nápovědou. Cílové URL je prázdné." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 msgid "Failed to open help page" msgstr "Nepodařilo se otevřít stránku s nápovědou." @@ -7339,5 +7356,5 @@ msgstr "Zeměpisná délka: " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "Koordináty" @@ -7399,12 +7416,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7429,33 +7446,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Bod {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Přiblížit na problém" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Nahrát hostorii" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Cesta {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7464,7 +7479,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Setřídit nabídku s přednastaveními" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7482,7 +7496,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7510,8 +7523,8 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" -msgstr "Verze {0} vytvořená {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7522,7 +7535,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7550,17 +7562,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Verze {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "smazáno" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Verze {0} vytvořená na {1} uživatelem {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7613,10 +7624,10 @@ msgstr "Zavírám sadu změn {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Vyberte soubor" @@ -7835,5 +7846,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7856,17 +7867,17 @@ msgstr "Vrstva" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Má se nahrát?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Má se uložit?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Jméno souboru" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7882,7 +7893,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Tagy nové sady změn" @@ -7928,29 +7939,29 @@ msgstr[2] "{0} smazaných objektů:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Nahrát změny na server" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Nahrát změněné objekty" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "Neplatný komentář k nahrávání" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Zrušit nahrávání na server a pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Nahrát všechny změny v jednom požadavku" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7960,38 +7971,38 @@ "prvku samostatně" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Napište stručný komentář ke změnám, které nahráváte na server:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "Zadejte komentář k nahrávání (min. 3 znaky)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Otevřít novou sadu změn" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "Otevřít novou sadu změn a použít ji v dalším nahrávání" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Použít otevřenou sadu změn" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Nahrát data do již otevřené sady změn" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Zavřít sadu změn po nahrání." -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "Vybrat pro zavření sady změn po následujícím nahrání" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7999,16 +8010,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Nahrát seznam vašich otevřených sad změn ze serveru" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Zavřít zvolenou otevřenou sadu změn" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8054,24 +8065,24 @@ msgstr "Pokračovat v nahrávaní" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Obrázky pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Číst GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Žádný čas pro bod {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8079,33 +8090,33 @@ msgstr "Čtu {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Obrázky s GPS souřadnicemi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Start GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Konec GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "nynější odchylka: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "rozdíl časových pásem: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8115,14 +8126,14 @@ msgstr[2] "obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Synchronizovat hodiny" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8130,32 +8141,32 @@ msgstr "JPEG obrázky (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Data v souboru \"{0}\" nemohla být parsována." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V souboru \"{0}\" není časová značka EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Obrázek" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synchronizace času s GPS přijímačem" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Zadaný čas nemůže být rozparsován" @@ -8245,5 +8256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8297,10 +8308,10 @@ msgstr[2] "{0} značek" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Převést do datové vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8310,11 +8321,11 @@ "
Pokud chcete nahrát trasy, podívejte se tady:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8324,29 +8335,29 @@ msgstr "Převedeno z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Stáhnout data z OSM podél této trasy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Stáhnout vše v rozmezí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metrů" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Maximální plocha na požadavek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} čtverečních km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8357,9 +8368,9 @@ "pokračovat?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8367,5 +8378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8375,23 +8386,23 @@ "byly vynechány." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "mimo stažený areál" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "verze {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8401,5 +8412,5 @@ msgstr[2] "Bylo nalezeno {0} konfliktů." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8420,5 +8431,5 @@ "objektů
z lokální datové sady protože byly vymazány na serveru." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8438,11 +8449,11 @@ "vyřešte je manuálně." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Klikněte pro uzavření tohoto dialogu a návrat k editaci" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8452,22 +8463,35 @@ msgstr[2] "{0} smazáno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "nenastaveno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Verze API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Převédst do GPX vrstvy" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Nenazezena příchozí cesta \"from\"." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8569,9 +8593,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Zobrazit/Skrýt Text/Ikony" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Přepnout viditelnost textu značek a ikon." @@ -8633,5 +8657,5 @@ msgstr "Výchozí hodnota není známa ( ještě nebyla definována )" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8639,5 +8663,5 @@ msgstr "Zvolte řádek k editaci" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8645,5 +8669,5 @@ msgstr "Nová hodnota pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8652,5 +8676,5 @@ msgstr "Zvolte řádek k vymazání" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Zadejte novou dvojici klíč/hodnota" @@ -8773,40 +8797,40 @@ msgstr "Kalibrace nahrávání zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Barva" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Styl kreslení {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Vrstva: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Vybrat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Zvolte barvu pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Nastavit na výchozí hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Nastavit vše na výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Barvy použité různými objekty v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Barvy" @@ -9245,17 +9269,17 @@ msgstr "Některá nastavení se projeví až po restartování JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Zobrazovat souřadnice jako" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Metoda projekce" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "Kód projekce" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "Hranice" @@ -9265,5 +9289,5 @@ msgstr "Projekce mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9321,81 +9345,81 @@ msgstr "Klávesová zkratka" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "Aktivní styly" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "Dostupné styly (z {0})" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Cesty k ikonám" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Krátká popiska: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Autor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Webová stránka: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Verze: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "Přidat soubor nebo URL aktivního stylu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "Odstranit vybrané styly ze seznamu aktivních" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "Upravit název souboru nebo URL vybraného aktivního stylu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "Přidat vybrané dostupné styly do seznamu aktivních" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "Znovu načíst seznam dostupných stylů z ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9404,6 +9428,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9571,10 +9595,10 @@ msgstr "Skupiny modifikátorů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9585,13 +9609,13 @@ msgstr[2] "Odstranit staré klíče z {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Přidat nový tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Smazat vybrané prvky v seznamu tagů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9599,18 +9623,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Volitelné atributy:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "uzavřená cesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Neznámý typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9621,15 +9645,15 @@ msgstr "Nelze načíst zdroj přednastavených tagů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Chyba parsování {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekty typu {0} nejsou podporovány." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9640,18 +9664,18 @@ msgstr[2] "Změnit {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -9667,6 +9691,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9675,8 +9699,21 @@ msgstr "Kontaktuji OSM server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Stahuji body {0} až {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''" #. SAXException does not chain correctly @@ -9793,5 +9830,5 @@ msgstr "Neznámý režim {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -9799,6 +9836,6 @@ "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9808,40 +9845,40 @@ msgstr "Stahuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Stahuji uzel s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Stahuji cestu s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Stahuji relaci s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Pro id {0} server odpověděl kódem 404. Přeskakuji." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Stahuji balík uzlů z ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Stahuji balík cest z ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Stahuji balík relací z ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9908,5 +9945,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9920,66 +9957,66 @@ "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Vytvářím sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Úspěšně otevřená sada změn {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Aktualizuji sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Aktualizuji sadu změn {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Zavírám sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Není k dizpozici sada změn pro rozdílový upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Nahrávám..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Čekám 10 sekund ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Zkusím nový pokus, {0} z {1}, během {2} sekund ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - další pokus." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "Zahajuji pokus {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "Aktuální sada změn je prázdná. Nelze nahrávat data na server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10014,5 +10051,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10039,5 +10076,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10045,5 +10082,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10056,5 +10093,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10216,5 +10253,5 @@ msgstr "Soubor \"{0}\" neexistuje" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10225,19 +10262,19 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "Nalezen XML element jinde, než jako přímý potomek elementu " -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Chybějící povinný atribut ''{0}'' na v cestě {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Neplatná hodnota atributu ''ref'' elementu . Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10245,20 +10282,20 @@ "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Chybějící atribut ''ref'' na členu v relaci {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10267,19 +10304,19 @@ "Neplatná hodnota atributu ''type'' na členu {0} v relaci {1}. Nalezeno {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Nekompletní specifikace s ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10289,10 +10326,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10302,25 +10337,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Chybějící atribut ''version'' na OSM objektu s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Chybějící povinný atribut ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10510,6 +10545,7 @@ msgid "{0} Plugin successfully downloaded." msgid_plural "{0} Plugins successfully downloaded." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} plugin stažen úspěšně." +msgstr[1] "{0} pluginy staženy úspěšně." +msgstr[2] "{0} pluginů staženo úspěšně." #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64 @@ -10547,5 +10583,5 @@ #, java-format msgid "Loading of {0} plugin was requested. This plugin is no longer required." -msgstr "" +msgstr "Požadováno nahrání pluginu {0}. Tento plugin není již nadále třeba." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83 @@ -10556,4 +10592,7 @@ "
Delete from preferences?" msgstr "" +"Požadováno nahrání pluginu {0}.
Vývoj tohoto pluginu byl ukončen a " +"pravděpodobně bude působit problemy.
Měl by být deaktivován.
Chcete " +"jej smazat z konfigurace?" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101 @@ -10563,4 +10602,7 @@ "Update plugins now?" msgstr "" +"Aktualizoval jste aplikaci JOSM.\n" +"Aby se zamezilo potížím s pluginy je třeba je taktéž aktualizovat.\n" +"Aktualizovat pluginy nyní?" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114 @@ -10572,5 +10614,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 msgid "Update plugins" -msgstr "" +msgstr "Aktualizace pluginů" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 @@ -10785,5 +10827,5 @@ msgstr "(Text již byl zkopírován do schránky.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10792,12 +10834,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10807,5 +10842,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10818,10 +10853,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10830,5 +10860,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10837,5 +10867,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10844,9 +10874,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10856,5 +10893,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10865,5 +10902,5 @@ "prověřte funkčnost internetového připojení." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10874,5 +10911,5 @@ "problémům s přenosem dat.
Detaily(nepřeloženo): {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10881,10 +10918,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10893,10 +10930,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10907,5 +10944,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10918,5 +10955,5 @@ "vaše internetové připojení." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11643,5 +11680,5 @@ msgstr "Chyba v souboru {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11654,29 +11691,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "Vybrat Feuille" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Chyba při nahrávání souboru" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Cache soubor pro Lambertovu zónu 2 (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Cache soubor pro Lambertovu zónu 3 (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Cache soubor pro Lambertovu zónu 4 (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11707,13 +11764,13 @@ msgstr "Vyberte z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Katastr" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11721,14 +11778,18 @@ "Would you like to restore F11 for grab action ?" msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +"Plugin cadastre-fr používá z historických příčin pro grabování horkou " +"klávesu F11\n" +"která je aktuálně použita pro přepnutí do celoobrazovkováho režimu\n" +"Chcete používat F11 pro grabování pluginem?" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12020,43 +12081,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "Ručně nastavit Lambertovu zónu" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zóna" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambertova zóna" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Načíst lokaci z cache (pouze pokud je cache povolena)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "{0} není se současnou projekcí dovolena" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Změnit umístění" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Nastavení nového místa pro další požadavek" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Přidat novou vrstvu" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Umístění" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12066,5 +12133,5 @@ "cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Přidat novou vrstvu" @@ -12096,5 +12163,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Upravit WMS" @@ -12124,5 +12191,5 @@ "Nejdříve vyberte jednu z nich a potom zopakujte" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12130,28 +12197,28 @@ msgstr "Prázdná vrstva" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS vrstva ({0}), nahráno {1} dlaždic" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Není vektorizovaný." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "Velikost rastru: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Je vektorizovaný." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12162,9 +12229,9 @@ "Vytvořte nový soubor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Chyba formátu cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12172,16 +12239,7 @@ "Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Chyba Lambertovy zóny v cache" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13238,20 +13296,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Chcete toto povolit?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Potvrdit akci dálkového ovládání" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:" @@ -13373,13 +13431,9 @@ msgstr "Zmenšit přiblížení" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Vyprázdnit cache dlaždic" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "obrázek " @@ -13961,6 +14015,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Neuspořádané pobřeží" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14611,12 +14666,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Stáhnout" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Stáhnout data z OSM serveru" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14632,9 +14685,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Není zde žádné vrstvy pro zdrojovou vrstvu
''{0}''
které by měly " -"být sloučeny." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14656,7 +14707,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Odstraňuji duplicitní uzly..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14722,29 +14772,29 @@ msgstr "Neplatná URL WMS nebo id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Upravit pozici zvolené WMS vrstvy" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Prosíme vyberte WMS vrstvu k upravení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Vybrat WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Začít upravování" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "Nejsou žádné WMS vrstvy k upravování." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "Žádné vrstvy k upravování" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14753,5 +14803,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14759,10 +14809,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "Upozornění: Úplné URL je ''{0}''." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14777,24 +14827,24 @@ msgstr "Automatické stahování" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(deaktivované)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14805,13 +14855,13 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Ano, stahovat obrázky" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "Neplatné URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14819,44 +14869,49 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Uložit WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Nahrát WMS vrstvu ze souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Načíst vrstvu WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Chyba formátu souboru" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Vytvořit záložku" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27204,8 +27259,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "neobvyklá kombinace tagů" @@ -27225,34 +27279,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE Mapy" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Mapy (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27262,9 +27305,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Ulice NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27278,49 +27324,832 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Český CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Český UHUL:ORTOFOTO" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "V historii není žádný prvek s verzí {0}" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "V historii není žádná verze platná k datu ''{0}''" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "nenalezena starší verze. Historie je prázdná." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "nenalezena novější verze. Historie je prázdná." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "V této datové sadě nelze nalézt prvek s id {0}" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE Mapy" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Mapy (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Cache soubor pro Lambertovu zónu 2 (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Cache soubor pro Lambertovu zónu 3 (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Cache soubor pro Lambertovu zónu 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Cache soubor pro Lambertovu zónu 2 (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Cache soubor pro Lambertovu zónu 3 (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Cache soubor pro Lambertovu zónu 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Cache soubor pro Lambertovu zónu 1 (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "UPOZORNĚNÍ: data umístěna příliš daleko \n" +#~ "od současných hranic zóny Lambertovy kartografické projekce.\n" +#~ "Neposílejte na server žádná data od této hlášky.\n" +#~ "Vraťte zpět poslední akci, uložte svou práci\n" +#~ "a vytvořte novou vrstvu v JOSM s novou zónou Lambertovy \n" +#~ "kartografické projekce.." + +#~ msgid "Edit Properties" +#~ msgstr "Upravit vlastnosti" + +#~ msgid "Linked" +#~ msgstr "Spojený" + +#~ msgid "Set manually the Lambert zone" +#~ msgstr "Ručně nastavit Lambertovu zónu" + +#~ msgid "Zone" +#~ msgstr "Zóna" + +#~ msgid "File could not be found." +#~ msgstr "Soubor nebyl nalezen" + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "No data imported." +#~ msgstr "Nic nebylo importováno" + +#~ msgid "Data Layer" +#~ msgstr "Vrstva dat" + +#~ msgid "Please select at least one task to download" +#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSM Online Nápověda" + +#~ msgid "Open in Browser" +#~ msgstr "Otevřít v prohlížeči" + +#~ msgid "unnamed" +#~ msgstr "nepojmenováno" + +#~ msgid "Unknown file extension." +#~ msgstr "Neznámá přípona souboru." + +#~ msgid "Change" +#~ msgstr "Změnit" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Smazat {1} {0}" + +#~ msgid "Rotate" +#~ msgstr "Otočit" + +#~ msgid "Move" +#~ msgstr "Přesunout" + +#~ msgid "false" +#~ msgstr "nepravda" + +#~ msgid "true" +#~ msgstr "pravda" + +#~ msgid "different" +#~ msgstr "různé" + +#~ msgid "position" +#~ msgstr "pozice" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "their version:" +#~ msgstr "verze na serveru:" + +#~ msgid "resolved version:" +#~ msgstr "finální verze:" + +#~ msgid "my version:" +#~ msgstr "moje verze:" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Revert" +#~ msgstr "Vrátit zpět" + +#~ msgid "Unsaved Changes" +#~ msgstr "Neuložené změny" + +#~ msgid "Please enter the desired coordinates first." +#~ msgstr "Prosím zadejte nejdříve pozadovanou pozici" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" + +#~ msgid "Error while loading page {0}" +#~ msgstr "Chyba při načítání stránky {0}" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nemohu se připojit na server." + +#~ msgid "There were conflicts during import." +#~ msgstr "Vznikly konflikty během importu" + +#~ msgid "Select a bookmark first." +#~ msgstr "Nejdříve zvolte záložku" + +#~ msgid "Error parsing server response." +#~ msgstr "Chyba parsování odezvy serveru" + +#~ msgid "name" +#~ msgstr "jméno" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontaktuji OSM server..." + +#~ msgid "Error while parsing" +#~ msgstr "Chyba při parsování" + +#~ msgid "File not found" +#~ msgstr "Soubor nebyl nalezen" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Spojit cesty patřící do jiné relace?" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" + +#~ msgid "All the ways were empty" +#~ msgstr "Všechny cesty byli prázdné" + +#~ msgid "Please enter a search string" +#~ msgstr "Prosím, zadejte hledaný řetězec" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Vyřešit konflikty" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM uživatelské jméno (email)" + +#~ msgid "Unknown version" +#~ msgstr "Neznámá verze" + +#~ msgid "Can only edit help pages from JOSM Online Help" +#~ msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Není otevřený žádný dokument, není co uložit." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Přihlašovací jméno (email) k OSM účtu." + +#~ msgid "Found element in non-way." +#~ msgstr "Nalezen element mimo cestu." + +#~ msgid " has zero ref" +#~ msgstr " má nulový ref" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu" + +#~ msgid "Conflicting relation" +#~ msgstr "Konfliktní relace" + +#~ msgid "Merging conflicts." +#~ msgstr "Spojení konfliktů" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako " +#~ "chybu." + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie." + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME oprava)" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objekt je v konfliktu:" +#~ msgstr[1] "{0} objekty mají konflikty:" +#~ msgstr[2] "{0} objektů má konflikty:" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste " +#~ "zmenšit oblast." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Chyba při mazání souboru pluginu: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin již existuje" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Nemohu stáhnout plugin: {0} z {1}" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Nápověda pluginu WMS Plugin" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} plugin úspěšně aktualizován. Prosím, restartujte JOSM." +#~ msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM." +#~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM." + +#~ msgid "Only one node selected" +#~ msgstr "Vybrán pouze jeden uzel" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." + +#~ msgid "help" +#~ msgstr "nápověda" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Některé z uzlů jsou (skoro) v přímce" + +#~ msgid "Found element in non-relation." +#~ msgstr "Nalezen tag mimo relaci." + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout." + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "Projekce \"{0}\" je navržena pouze\n" +#~ "pro zeměpisné šířky mezi 46.1° a 57°.\n" +#~ "Použijte jiný projekční systém, pokud nepoužíváte\n" +#~ "francouzský WMS server.\n" +#~ "Nenáhrávejte žádná data po zobrazení této hlášky!" + +#~ msgid "Upload to OSM..." +#~ msgstr "Nahrát do OSM..." + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému " +#~ "vývojáře JOSM." + +#~ msgid "Only two nodes allowed" +#~ msgstr "Povoleny pouze dva uzly" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Nelze otevřít adresář s nastavením: {0}" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Opravdu označit tento problém jako \"hotový\"?" + +#~ msgid "Validate" +#~ msgstr "Ověřit" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data." + +#~ msgid "Open User Page in browser" +#~ msgstr "Otevřít stránku uživatele v prohlížeči" + +#~ msgid "Select User's Data" +#~ msgstr "Vybrat data uživatele" + +#~ msgid "Open User Page" +#~ msgstr "Otevřít stránku uživatele" + +#~ msgid "Sorry, doesn't work with anonymous users" +#~ msgstr "Sorry, nefunguje s anonymními uživateli." + +#~ msgid "Commit comment" +#~ msgstr "Poslat komentář" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\"" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "Použít přednastavení \"{0}\"" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování" + +#~ msgid "History of Element" +#~ msgstr "Historie prvku" + +#~ msgid "Please select one or more closed ways of at least four nodes." +#~ msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." + +#~ msgid "Layers: {0}" +#~ msgstr "Vrstvy: {0}" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikty: {0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Autoři: {0}" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importovat TCX soubor jako GPS trasu" + +#~ msgid "Import TCX File..." +#~ msgstr "Importovat TCX soubor..." + +#~ msgid "Please select the row to copy." +#~ msgstr "Vyberte řádek ke zkopírování." + +#~ msgid "viaduct" +#~ msgstr "viadukt" + +#~ msgid "Drawbridge" +#~ msgstr "Padací most" + +#~ msgid "zoom" +#~ msgstr "Zvětšení" + +#~ msgid "Cannot read place search results from server" +#~ msgstr "Nemohu načíst výsledky hledání ze serveru" + +#~ msgid "Occupied By" +#~ msgstr "Obsazeno" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tagy (prázdná hodnota vymaže tag)" + +#~ msgid "Remove Selected" +#~ msgstr "Odebrat označené" + +#~ msgid "Basic" +#~ msgstr "Základní" + +#~ msgid "Refresh the selection list." +#~ msgstr "Obnovit výběr" + +#~ msgid "Empty member in relation." +#~ msgstr "Prázdný prvek v relaci." + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Spojit uzly s různými členství v relaci?" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Přidat všechny zvolené objekty mezi prvky" + +#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" +#~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou " +#~ "{1}" + +#~ msgid "Continue anyway" +#~ msgstr "Přesto pokračovat" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "" +#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před " +#~ "nahráním na server." + +#~ msgid "Open a layer first (GPX, OSM, cache)" +#~ msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org" + +#~ msgid "Public" +#~ msgstr "Veřejné" + +#~ msgid "Please select some data" +#~ msgstr "Vyberte nějaká data" + +#~ msgid "Show Author Panel" +#~ msgstr "Zobrazit panel autorů" + +#~ msgid "Please choose a user using the author panel" +#~ msgstr "Vyberte uživatele v panelu autorů" + +#~ msgid "Station" +#~ msgstr "Stanice" + +#~ msgid "Edit Station" +#~ msgstr "Upravit stanici" + +#~ msgid "sports" +#~ msgstr "Sportovní potřeby" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Nápověda: některé změny vznikly nahráním nových dat na server." + +#~ msgid "Server does not support changesets" +#~ msgstr "Server nepodporuje sady změn" + +#~ msgid "Ill-formed node id" +#~ msgstr "Neplatné id uzlu" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Odstranit prvek v aktuálním řádku tabulky z relace" + +#~ msgid "Tagging preset sources" +#~ msgstr "Zdroje přednastavení tagů" + +#~ msgid "Tagging preset source" +#~ msgstr "Zdroj přednastavených tagů" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam." + +#~ msgid "Delete and Download" +#~ msgstr "Smazat a stáhnout" + +#~ msgid "Merge Anyway" +#~ msgstr "Přesto sloučit" + +#~ msgid "requested: {0}" +#~ msgstr "požadováno: {0}" + +#~ msgid "error requesting update" +#~ msgstr "chyba při poždavku na aktualizaci" + +#~ msgid "error loading metadata" +#~ msgstr "chyba při nahrávání metadat" + +#~ msgid "Request Update" +#~ msgstr "Vyžádat aktualizaci" + +#~ msgid "Show Tile Status" +#~ msgstr "Zobrazit stav dlaždice" + +#~ msgid "Download Image from french Cadastre WMS" +#~ msgstr "Stáhnout obrázek z WMS francouzského katastru" + +#~ msgid "Move Down" +#~ msgstr "Posunout dolů" + +#~ msgid "Move Up" +#~ msgstr "Posunout nahoru" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editor relací: {0}" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s " +#~ "nastavením.
Heslo je na server posíláno nezašifrované, zakódované v " +#~ "URL.
Nepoužívejte stejné heslo, které používáte někde jinde." + +#~ msgid "Combine Anyway" +#~ msgstr "Přesto zkombinovat" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na " +#~ "server mají historii." + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?" + +#~ msgid "Update Data" +#~ msgstr "Aktualizovat data" + +#~ msgid "Change the projection to {0} first." +#~ msgstr "Nejprve změňte projekci na {0}." + +#~ msgid "Invalid projection" +#~ msgstr "Neplatná projekce" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Upravit padací most" + +#~ msgid "Edit Portcullis" +#~ msgstr "Upravit zkratky" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Následující chyby nastaly při hromadném stahování:" + +#~ msgid "Map Type" +#~ msgstr "Typ mapy" + +#~ msgid "citymap" +#~ msgstr "plán města" + +#~ msgid "hikingmap" +#~ msgstr "turistická mapa" + +#~ msgid "map" +#~ msgstr "mapa" + +#~ msgid "bicyclemap" +#~ msgstr "cyklistická mapa" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou " +#~ "vrstvu?" + +#~ msgid "The projection could not be read from preferences. Using EPSG:4326" +#~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326" + +#~ msgid "Edit Information Office" +#~ msgstr "Editovat turistické informační centrum" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé " +#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." + +#~ msgid "Board Type" +#~ msgstr "Typ nástěnky" + +#~ msgid "board" +#~ msgstr "obecná nástěnka" + +#~ msgid "" +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." +#~ msgstr "" +#~ "Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří " +#~ "určitmu uživateli, otevře prohlížeč se stránkou vybraného autora." + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Otevře soubory TCX přímo v JOSM." + +#~ msgid "" +#~ "The main feature of the plugin is the possibility to delete points of the " +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." +#~ msgstr "" +#~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento " +#~ "plugin může být použit pro přípravu tras pro uploud do OSM." + +#~ msgid "" +#~ "(You can change the number of days after which this warning appears
by " +#~ "setting the config option 'pluginmanager.warntime'.)" +#~ msgstr "" +#~ "(Počet dní, po kterých se zobrazí varování
můžete změnit pomocí " +#~ "'pluginmanager.warntime'.)" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Archiv pluginů je již přítomen. Přejete si stáhnout současnou verzi a " +#~ "odstranit existující archiv?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "Chyba nastala při pokusu o dosazení fotografií do GPX trasy. Můžete ručně " +#~ "upravit posuvníky aby byli fotografie dosazeny." + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "Kartografická projekce \"{0}\" je použitelná pouze pro\n" +#~ "zeměpisné šířky mezi 45.7° a 47.9°\n" +#~ "a zeměpisné délky mezi 5.7° a 10.6°.\n" +#~ "Použijte jinou projekci v JOSM, pokud nepracujete\n" +#~ "přímo na území Švýcarska nebo Lichtenštejnska.\n" +#~ "Od této zprávy neposílejte na server žádná data." + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný." + +#~ msgid "Update failed" +#~ msgstr "Aktualizace selhala" + +#~ msgid "Selection too big" +#~ msgstr "Výběr je příliš velký" + +#~ msgid "Conflict detected" +#~ msgstr "Detekován konflikt" + +#~ msgid "relations" +#~ msgstr "vazby" + +#~ msgid "ways" +#~ msgstr "cesty" + +#~ msgid "Upload to OSM API failed" +#~ msgstr "Nahrándí do OSM API selhalo" + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Selhala inicializace API, prosím zkuste to znovu později." + +#~ msgid "API initialization failed" +#~ msgstr "Selhala inicializace API" + +#~ msgid "" +#~ "WARNING: launching browser windows for the first {0} of {1} selected " +#~ "primitives only" +#~ msgstr "" +#~ "UPOZORNĚNÍ: Otevírám okno prohlížeče pouze pro první {0} z {1} vybraných " +#~ "primitiv." + +#~ msgid "No data" +#~ msgstr "Žádná data" + +#~ msgid "nodes" +#~ msgstr "body" + +#~ msgid "Updates the currently selected primitives from the server" +#~ msgstr "Aktualizovat právě vybrané prvky ze serveru" + +#~ msgid "Missing primitive" +#~ msgstr "Chybějící prvek" + +#~ msgid "Primitive already deleted" +#~ msgstr "Prvek byl již smazán" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Odstraňuji 1 prvek" + +#~ msgid "Remove relation member {0} {1}" +#~ msgstr "Odstranit člena relace {0} {1}" #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" #~ msgstr "V této datové sadě nelze nalézt prvek s id {0} a verzí {1}" -#~ msgid "Select a starting node on the end of a way" -#~ msgstr "Vyberte počáteční bod na konci cesty" - -#~ msgid "Reached the end of the line" -#~ msgstr "Dosažen konec cesty" - -#~ msgid "Reached a junction" -#~ msgstr "Dosažena křižovatka" - -#~ msgid "help" -#~ msgstr "nápověda" - -#~ msgid "Help / About" -#~ msgstr "Nápověda / O programu" +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parametr '{0}' nesmí být null (prázdný)" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Aplikovat částečná řešení" + +#~ msgid "History item" +#~ msgstr "Položka historie" + +#~ msgid "Failed to load history from the server. Details:
{0}" +#~ msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" + +#~ msgid "Add a new XML source to the list." +#~ msgstr "Pridat do seznamu nový XML zdroj." + +#~ msgid "The XML source (URL or filename) for {0} definition files." +#~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory." #~ msgid "" @@ -27371,693 +28200,4 @@ #~ "šiřitelný), pokud si nejste jisti, nepoužívejte jej." -#~ msgid "WMS Plugin Help" -#~ msgstr "Nápověda pluginu WMS Plugin" - -#~ msgid "File could not be found." -#~ msgstr "Soubor nebyl nalezen" - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "No data imported." -#~ msgstr "Nic nebylo importováno" - -#~ msgid "Data Layer" -#~ msgstr "Vrstva dat" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSM Online Nápověda" - -#~ msgid "Open in Browser" -#~ msgstr "Otevřít v prohlížeči" - -#~ msgid "unnamed" -#~ msgstr "nepojmenováno" - -#~ msgid "Unknown file extension." -#~ msgstr "Neznámá přípona souboru." - -#~ msgid "Change" -#~ msgstr "Změnit" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Smazat {1} {0}" - -#~ msgid "Rotate" -#~ msgstr "Otočit" - -#~ msgid "Move" -#~ msgstr "Přesunout" - -#~ msgid "false" -#~ msgstr "nepravda" - -#~ msgid "true" -#~ msgstr "pravda" - -#~ msgid "different" -#~ msgstr "různé" - -#~ msgid "position" -#~ msgstr "pozice" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "their version:" -#~ msgstr "verze na serveru:" - -#~ msgid "resolved version:" -#~ msgstr "finální verze:" - -#~ msgid "my version:" -#~ msgstr "moje verze:" - -#~ msgid "Date" -#~ msgstr "Datum" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Revert" -#~ msgstr "Vrátit zpět" - -#~ msgid "Unsaved Changes" -#~ msgstr "Neuložené změny" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Prosím zadejte nejdříve pozadovanou pozici" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" - -#~ msgid "Error while loading page {0}" -#~ msgstr "Chyba při načítání stránky {0}" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nemohu se připojit na server." - -#~ msgid "There were conflicts during import." -#~ msgstr "Vznikly konflikty během importu" - -#~ msgid "Select a bookmark first." -#~ msgstr "Nejdříve zvolte záložku" - -#~ msgid "Error parsing server response." -#~ msgstr "Chyba parsování odezvy serveru" - -#~ msgid "name" -#~ msgstr "jméno" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Kontaktuji OSM server..." - -#~ msgid "Error while parsing" -#~ msgstr "Chyba při parsování" - -#~ msgid "File not found" -#~ msgstr "Soubor nebyl nalezen" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Spojit cesty patřící do jiné relace?" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" - -#~ msgid "All the ways were empty" -#~ msgstr "Všechny cesty byli prázdné" - -#~ msgid "Please enter a search string" -#~ msgstr "Prosím, zadejte hledaný řetězec" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Vyřešit konflikty" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM uživatelské jméno (email)" - -#~ msgid "Unknown version" -#~ msgstr "Neznámá verze" - -#~ msgid "Can only edit help pages from JOSM Online Help" -#~ msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Není otevřený žádný dokument, není co uložit." - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Přihlašovací jméno (email) k OSM účtu." - -#~ msgid "Found element in non-way." -#~ msgstr "Nalezen element mimo cestu." - -#~ msgid " has zero ref" -#~ msgstr " má nulový ref" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu" - -#~ msgid "Conflicting relation" -#~ msgstr "Konfliktní relace" - -#~ msgid "Merging conflicts." -#~ msgstr "Spojení konfliktů" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako " -#~ "chybu." - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie." - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME oprava)" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objekt je v konfliktu:" -#~ msgstr[1] "{0} objekty mají konflikty:" -#~ msgstr[2] "{0} objektů má konflikty:" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste " -#~ "zmenšit oblast." - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}." - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Chyba při mazání souboru pluginu: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin již existuje" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Nemohu stáhnout plugin: {0} z {1}" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} plugin úspěšně aktualizován. Prosím, restartujte JOSM." -#~ msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM." -#~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM." - -#~ msgid "Only one node selected" -#~ msgstr "Vybrán pouze jeden uzel" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Některé z uzlů jsou (skoro) v přímce" - -#~ msgid "Found element in non-relation." -#~ msgstr "Nalezen tag mimo relaci." - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout." - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "Projekce \"{0}\" je navržena pouze\n" -#~ "pro zeměpisné šířky mezi 46.1° a 57°.\n" -#~ "Použijte jiný projekční systém, pokud nepoužíváte\n" -#~ "francouzský WMS server.\n" -#~ "Nenáhrávejte žádná data po zobrazení této hlášky!" - -#~ msgid "Upload to OSM..." -#~ msgstr "Nahrát do OSM..." - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému " -#~ "vývojáře JOSM." - -#~ msgid "Only two nodes allowed" -#~ msgstr "Povoleny pouze dva uzly" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Nelze otevřít adresář s nastavením: {0}" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Opravdu označit tento problém jako \"hotový\"?" - -#~ msgid "Validate" -#~ msgstr "Ověřit" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data." - -#~ msgid "Open User Page in browser" -#~ msgstr "Otevřít stránku uživatele v prohlížeči" - -#~ msgid "Select User's Data" -#~ msgstr "Vybrat data uživatele" - -#~ msgid "Open User Page" -#~ msgstr "Otevřít stránku uživatele" - -#~ msgid "Sorry, doesn't work with anonymous users" -#~ msgstr "Sorry, nefunguje s anonymními uživateli." - -#~ msgid "Commit comment" -#~ msgstr "Poslat komentář" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\"" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "Použít přednastavení \"{0}\"" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování" - -#~ msgid "History of Element" -#~ msgstr "Historie prvku" - -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." - -#~ msgid "Layers: {0}" -#~ msgstr "Vrstvy: {0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikty: {0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Autoři: {0}" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importovat TCX soubor jako GPS trasu" - -#~ msgid "Import TCX File..." -#~ msgstr "Importovat TCX soubor..." - -#~ msgid "Please select the row to copy." -#~ msgstr "Vyberte řádek ke zkopírování." - -#~ msgid "viaduct" -#~ msgstr "viadukt" - -#~ msgid "Drawbridge" -#~ msgstr "Padací most" - -#~ msgid "zoom" -#~ msgstr "Zvětšení" - -#~ msgid "Cannot read place search results from server" -#~ msgstr "Nemohu načíst výsledky hledání ze serveru" - -#~ msgid "Occupied By" -#~ msgstr "Obsazeno" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tagy (prázdná hodnota vymaže tag)" - -#~ msgid "Remove Selected" -#~ msgstr "Odebrat označené" - -#~ msgid "Basic" -#~ msgstr "Základní" - -#~ msgid "Refresh the selection list." -#~ msgstr "Obnovit výběr" - -#~ msgid "Empty member in relation." -#~ msgstr "Prázdný prvek v relaci." - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Spojit uzly s různými členství v relaci?" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Přidat všechny zvolené objekty mezi prvky" - -#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -#~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou " -#~ "{1}" - -#~ msgid "Continue anyway" -#~ msgstr "Přesto pokračovat" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před " -#~ "nahráním na server." - -#~ msgid "Open a layer first (GPX, OSM, cache)" -#~ msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org" - -#~ msgid "Public" -#~ msgstr "Veřejné" - -#~ msgid "Please select some data" -#~ msgstr "Vyberte nějaká data" - -#~ msgid "Show Author Panel" -#~ msgstr "Zobrazit panel autorů" - -#~ msgid "Please choose a user using the author panel" -#~ msgstr "Vyberte uživatele v panelu autorů" - -#~ msgid "Station" -#~ msgstr "Stanice" - -#~ msgid "Edit Station" -#~ msgstr "Upravit stanici" - -#~ msgid "sports" -#~ msgstr "Sportovní potřeby" - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Nápověda: některé změny vznikly nahráním nových dat na server." - -#~ msgid "Server does not support changesets" -#~ msgstr "Server nepodporuje sady změn" - -#~ msgid "Ill-formed node id" -#~ msgstr "Neplatné id uzlu" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Odstranit prvek v aktuálním řádku tabulky z relace" - -#~ msgid "Tagging preset sources" -#~ msgstr "Zdroje přednastavení tagů" - -#~ msgid "Tagging preset source" -#~ msgstr "Zdroj přednastavených tagů" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam." - -#~ msgid "Delete and Download" -#~ msgstr "Smazat a stáhnout" - -#~ msgid "Merge Anyway" -#~ msgstr "Přesto sloučit" - -#~ msgid "requested: {0}" -#~ msgstr "požadováno: {0}" - -#~ msgid "error requesting update" -#~ msgstr "chyba při poždavku na aktualizaci" - -#~ msgid "error loading metadata" -#~ msgstr "chyba při nahrávání metadat" - -#~ msgid "Request Update" -#~ msgstr "Vyžádat aktualizaci" - -#~ msgid "Show Tile Status" -#~ msgstr "Zobrazit stav dlaždice" - -#~ msgid "Download Image from french Cadastre WMS" -#~ msgstr "Stáhnout obrázek z WMS francouzského katastru" - -#~ msgid "Move Down" -#~ msgstr "Posunout dolů" - -#~ msgid "Move Up" -#~ msgstr "Posunout nahoru" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editor relací: {0}" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s " -#~ "nastavením.
Heslo je na server posíláno nezašifrované, zakódované v " -#~ "URL.
Nepoužívejte stejné heslo, které používáte někde jinde." - -#~ msgid "Combine Anyway" -#~ msgstr "Přesto zkombinovat" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na " -#~ "server mají historii." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?" - -#~ msgid "Update Data" -#~ msgstr "Aktualizovat data" - -#~ msgid "Change the projection to {0} first." -#~ msgstr "Nejprve změňte projekci na {0}." - -#~ msgid "Invalid projection" -#~ msgstr "Neplatná projekce" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Upravit padací most" - -#~ msgid "Edit Portcullis" -#~ msgstr "Upravit zkratky" - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Následující chyby nastaly při hromadném stahování:" - -#~ msgid "Map Type" -#~ msgstr "Typ mapy" - -#~ msgid "citymap" -#~ msgstr "plán města" - -#~ msgid "hikingmap" -#~ msgstr "turistická mapa" - -#~ msgid "map" -#~ msgstr "mapa" - -#~ msgid "bicyclemap" -#~ msgstr "cyklistická mapa" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "" -#~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou " -#~ "vrstvu?" - -#~ msgid "The projection could not be read from preferences. Using EPSG:4326" -#~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326" - -#~ msgid "Edit Information Office" -#~ msgstr "Editovat turistické informační centrum" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé " -#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." - -#~ msgid "Board Type" -#~ msgstr "Typ nástěnky" - -#~ msgid "board" -#~ msgstr "obecná nástěnka" - -#~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to " -#~ "selected user, opens browser showing selected author profile page." -#~ msgstr "" -#~ "Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří " -#~ "určitmu uživateli, otevře prohlížeč se stránkou vybraného autora." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Otevře soubory TCX přímo v JOSM." - -#~ msgid "" -#~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to " -#~ "OSM eg. deleting uninteresting parts of track." -#~ msgstr "" -#~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento " -#~ "plugin může být použit pro přípravu tras pro uploud do OSM." - -#~ msgid "" -#~ "(You can change the number of days after which this warning appears
by " -#~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "" -#~ "(Počet dní, po kterých se zobrazí varování
můžete změnit pomocí " -#~ "'pluginmanager.warntime'.)" - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Archiv pluginů je již přítomen. Přejete si stáhnout současnou verzi a " -#~ "odstranit existující archiv?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "Chyba nastala při pokusu o dosazení fotografií do GPX trasy. Můžete ručně " -#~ "upravit posuvníky aby byli fotografie dosazeny." - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 45.7° and 47.9°\n" -#~ "and longitutes between 5.7° and 10.6° only.\n" -#~ "Use another projection system if you are not working\n" -#~ "on a data set of Switzerland or Liechtenstein.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "Kartografická projekce \"{0}\" je použitelná pouze pro\n" -#~ "zeměpisné šířky mezi 45.7° a 47.9°\n" -#~ "a zeměpisné délky mezi 5.7° a 10.6°.\n" -#~ "Použijte jinou projekci v JOSM, pokud nepracujete\n" -#~ "přímo na území Švýcarska nebo Lichtenštejnska.\n" -#~ "Od této zprávy neposílejte na server žádná data." - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný." - -#~ msgid "Update failed" -#~ msgstr "Aktualizace selhala" - -#~ msgid "Selection too big" -#~ msgstr "Výběr je příliš velký" - -#~ msgid "Conflict detected" -#~ msgstr "Detekován konflikt" - -#~ msgid "relations" -#~ msgstr "vazby" - -#~ msgid "ways" -#~ msgstr "cesty" - -#~ msgid "Upload to OSM API failed" -#~ msgstr "Nahrándí do OSM API selhalo" - -#~ msgid "Failed to initialize API. Please try again later." -#~ msgstr "Selhala inicializace API, prosím zkuste to znovu později." - -#~ msgid "API initialization failed" -#~ msgstr "Selhala inicializace API" - -#~ msgid "" -#~ "WARNING: launching browser windows for the first {0} of {1} selected " -#~ "primitives only" -#~ msgstr "" -#~ "UPOZORNĚNÍ: Otevírám okno prohlížeče pouze pro první {0} z {1} vybraných " -#~ "primitiv." - -#~ msgid "No data" -#~ msgstr "Žádná data" - -#~ msgid "nodes" -#~ msgstr "body" - -#~ msgid "Updates the currently selected primitives from the server" -#~ msgstr "Aktualizovat právě vybrané prvky ze serveru" - -#~ msgid "Missing primitive" -#~ msgstr "Chybějící prvek" - -#~ msgid "Primitive already deleted" -#~ msgstr "Prvek byl již smazán" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Odstraňuji 1 prvek" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Odstranit člena relace {0} {1}" - -#~ msgid "parameter '{0}' must not be null" -#~ msgstr "parametr '{0}' nesmí být null (prázdný)" - -#~ msgid "Apply partial resolutions" -#~ msgstr "Aplikovat částečná řešení" - -#~ msgid "History item" -#~ msgstr "Položka historie" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" - -#~ msgid "Add a new XML source to the list." -#~ msgstr "Pridat do seznamu nový XML zdroj." - -#~ msgid "The XML source (URL or filename) for {0} definition files." -#~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory." - #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" @@ -28080,4 +28220,7 @@ #~ msgid "Unknown file extension for file ''{0}''" #~ msgstr "Neznámá přípona souboru ''{0}''" + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data." #~ msgid "" @@ -28152,4 +28295,13 @@ #~ msgstr "Zkopírovat výchozí hodnoty" +#~ msgid "Reached the end of the line" +#~ msgstr "Dosažen konec cesty" + +#~ msgid "Select a starting node on the end of a way" +#~ msgstr "Vyberte počáteční bod na konci cesty" + +#~ msgid "Reached a junction" +#~ msgstr "Dosažena křižovatka" + #~ msgid "Help page missing. Create it in English." #~ msgstr "Chybí stránka nápovědy. Vytvořte ji v češtině." @@ -28162,4 +28314,7 @@ #~ "anebo ve vašem jazyce." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "V této datové sadě nelze nalézt prvek s id {0}" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "" @@ -28176,4 +28331,16 @@ #~ msgstr "Neočekávaná návratová hodnota. Navráceno {0}" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "V historii není žádný prvek s verzí {0}" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "V historii není žádná verze platná k datu ''{0}''" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "nenalezena starší verze. Historie je prázdná." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "nenalezena novější verze. Historie je prázdná." + #~ msgid "Display the history of the selected primitive." #~ msgstr "Zobrazit historii vybraného prvku" @@ -28190,2 +28357,5 @@ #~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno " #~ "''{1}''" + +#~ msgid "Help / About" +#~ msgstr "Nápověda / O programu" Index: applications/editors/josm/i18n/po/da.po =================================================================== --- applications/editors/josm/i18n/po/da.po (revision 18772) +++ applications/editors/josm/i18n/po/da.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:00+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 17:45+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Danish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:04+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjælp" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorerer defekt URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorerer defekt fil-URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kunne ikke læse filen \"{0}\".
Fejlen er:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kunne ikke læse filen \"{0}\".
Fejlen er:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Fejl" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -302,5 +303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -309,27 +310,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -347,5 +348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Fortryd" @@ -355,19 +356,19 @@ msgstr "Vælg venligst et allerede uploadet punkt, vej eller relation." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Sammenflet" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -378,5 +379,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -489,13 +490,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -593,20 +594,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Der er ingen åbne rettesæt" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Ingen åbne rettesæt" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -646,10 +647,10 @@ "af punkter)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Sammensæt {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Vælg mindst to veje at sammensætte." @@ -695,10 +696,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -717,11 +718,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Overskriv" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Filen findes allerede. Overskriv?" @@ -768,5 +769,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -775,6 +776,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -790,7 +791,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -818,5 +818,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplikér" @@ -840,30 +840,30 @@ msgstr "Afslut programmet." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Alle formater" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Eksporter til GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Eksporter dataet til GPS-fil." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Intet at eksportere. Hent først noget data." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -871,13 +871,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -896,8 +896,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -905,7 +905,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -928,9 +928,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -942,5 +942,5 @@ msgstr "parameteren \"{0}\" må ikke være en null-værdi" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -948,5 +948,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Eksportér GPX-fil" @@ -1092,6 +1092,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Ny" @@ -1220,5 +1220,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Sæt ind" @@ -1306,11 +1306,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Gem" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Gem nuværende data." @@ -1367,10 +1367,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Gem som..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Gem det nuværende data i en ny fil." @@ -1389,29 +1389,29 @@ "objekter." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Vis statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "Vis statusrapport med brugbare informationer, der kan tilknyttes fejl." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Hjælp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopier til udklipsholder og luk" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1571,5 +1571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1577,5 +1577,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1622,55 +1622,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Opdater det valgte" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Opdater det valgte" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Der er ingen valgte primitiver at opdatere." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Intet er valgt" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Opdater det valgte" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1679,5 +1676,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1685,29 +1682,29 @@ msgstr "Ingen ændringer at sende." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Intet at sende. Skab først noget data." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synkronisér hele datasættet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1721,11 +1718,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1736,5 +1733,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1744,22 +1741,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1770,19 +1767,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Opdaterer primitiv" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1791,5 +1788,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1798,15 +1795,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1918,17 +1915,17 @@ msgstr "Langsommere fremad" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Henter GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Hent GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Henter data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1936,5 +1933,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1988,9 +1985,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Fejl ved download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2008,5 +2005,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2014,5 +2011,5 @@ msgstr "Tilstand: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2109,7 +2106,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Tegn en firkant af passende størrelse og slip så museknappen." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2118,9 +2114,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Tegn et vejsegment for at danne et rektangel." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2132,5 +2127,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2150,17 +2145,17 @@ msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Flyt elementer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Flyt dem" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Fortryd flytning" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2170,13 +2165,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Slip museknappen for at vælge objekterne inden i firkanten." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2185,9 +2180,9 @@ "nærmeste punkt." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Slip museknappen for at stoppe rotationen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2198,15 +2193,15 @@ "valgte" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Forstør" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zoom og flyt kort" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2214,10 +2209,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Søg..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2226,58 +2221,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Indtast en søgetekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regulært udtryk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "erstat valgte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "føj til valgte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "fjern fra valgte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regulært udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' og 'Street' i enhver nøgle eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' i enhver nøgle eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' hvor som helst i navnet." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2285,34 +2279,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - intet 'Bak' i navnet." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +msgid "foot: - key=foot set to any value." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "Special targets:" msgstr "Specielle mål:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - alle objekter rettet af bruger" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2320,44 +2314,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - alle ændrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - alle valgte objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle ufuldstændige objekter" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +msgid "untagged - all untagged objects" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" +msgid "Use | or OR to combine with logical or" +msgstr "" +"Brug | eller OR to for at forbinde med et logisk \"eller\"" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" -msgstr "" -"Brug | eller OR to for at forbinde med et logisk \"eller\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Brug \" for at angive operatorer (fx hvis key indeholder : )" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Brug ( og ) for at gruppere udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2367,51 +2361,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Søg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Start søgning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Intet resultat for \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Intet fjernet fra det valgte ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Fandt {0} resultater" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "Versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "Ikke-versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "Regulært udtryk" @@ -2429,40 +2423,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Mangler argumenter for \"eller\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Mangler argument fro \"ikke\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Forventede slutparentes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2471,9 +2465,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2482,5 +2476,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2581,7 +2575,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2691,5 +2685,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2714,5 +2708,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2720,6 +2714,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2789,17 +2783,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2833,10 +2817,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2869,20 +2853,20 @@ msgstr "Sekvens" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2904,10 +2888,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2951,5 +2935,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Ny værdi" @@ -2996,7 +2980,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3005,10 +2989,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Fejl i konfigurationsfilen ved linjerne {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3017,5 +3001,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3024,5 +3008,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3031,5 +3015,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3038,5 +3022,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3044,5 +3028,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3051,5 +3035,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3058,5 +3042,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3065,5 +3049,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3072,10 +3056,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3156,25 +3140,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3182,5 +3166,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3188,5 +3172,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3196,26 +3180,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Mangler argument fro \"ikke\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3224,5 +3208,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3285,24 +3269,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3310,5 +3294,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3336,10 +3320,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3350,7 +3334,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3504,10 +3488,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Fejl: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3519,6 +3503,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3528,5 +3512,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3536,6 +3520,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3553,6 +3537,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "baggrund" @@ -3570,19 +3554,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambert-zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3596,26 +3597,52 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3630,10 +3657,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Vis ikke igen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3641,32 +3668,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "ufuldstændig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "landevej" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "jernbane" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vandvej" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "brug af jord" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3675,5 +3702,5 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3711,6 +3738,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Konflikt" @@ -3720,11 +3747,11 @@ msgstr "Ukendt vært" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3927,11 +3954,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4046,5 +4073,5 @@ msgstr "Længden af det nytegnede vejstykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4052,18 +4079,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "lag er ikke i listen" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4185,67 +4212,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Punkter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags ({0} konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Punkter (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Punkter (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Medlemmer (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4253,68 +4280,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Egenskaber (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Sammenlign " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Min version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4322,5 +4349,5 @@ msgstr "Sammenflettet version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4328,30 +4355,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Deres version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> top" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> bund" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4359,5 +4386,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4365,14 +4392,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4380,5 +4407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4386,54 +4413,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Op" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Flyt de valgte elementer ét trin op" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Ned" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Flyt de valgte elementer ét trin ned" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Fjern" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4442,5 +4469,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4449,5 +4476,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4456,5 +4483,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4463,5 +4490,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4470,6 +4497,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4478,6 +4505,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4488,5 +4515,5 @@ msgstr "Punkt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4498,5 +4525,5 @@ msgstr "uventet kolonne-indeks. Modtog {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4505,19 +4532,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Ja, gendan også dem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Nej, fortryd handlingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4528,9 +4555,9 @@ "slettet på serveren.

Ønsker du også at gendanne disse punkter?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Gendan yderligere punkter?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4540,5 +4567,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Gendan afhængige primitiver?" @@ -4562,84 +4589,84 @@ msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "ingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "ikke slettet" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Behold mine koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Behold deres koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4649,17 +4676,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4668,9 +4695,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4685,19 +4712,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4713,10 +4740,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4726,10 +4753,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4756,27 +4783,27 @@ msgstr "Deres version (serverens datasæt)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4801,22 +4828,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4824,5 +4851,5 @@ msgstr "intet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4913,6 +4940,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4923,5 +4950,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4935,21 +4962,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4957,5 +4984,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5042,10 +5069,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5065,13 +5092,13 @@ msgstr "Kommando-stak: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5079,5 +5106,5 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5086,25 +5113,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5116,13 +5143,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5134,8 +5161,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5202,5 +5229,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5232,34 +5259,34 @@ msgstr "Åbn en liste af alle hentede lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Slet det valgte lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Vis/skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Skift synligheden for det valgte lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Flyt det valgte lag en række op." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Flyt det valgte lag en række ned." @@ -5269,18 +5296,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Dette vil ændre på op til {0} objekt." -msgstr[1] "Dette vil ændre på op til {0} objekter." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "En tom værdi vil slette nøglen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5289,10 +5315,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Ret værdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5301,5 +5327,5 @@ msgstr[1] "Ret egenskaber for op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5308,9 +5334,9 @@ msgstr[1] "Dette vil ændre på op til {0} objekter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Vælg venligst en nøgle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Vælg venligst en værdi" @@ -5334,102 +5360,98 @@ msgstr "Medlem af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Tilføj egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Egenskaber: {0} / Medlemskaber: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Egenskaber / Medlemskaber" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Skift relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Slet fra relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Slet virkelig det valgte fra relation {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Fjern den valgte nøgle i alle objekter" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Fjern egenskaber" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Rediger egenskaber" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Ret værdien for den valgte nøgle for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Egenskaber: {0} / Medlemskaber: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Egenskaber / Medlemskaber" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Skift relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Slet fra relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Slet virkelig det valgte fra relation {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Fjern den valgte nøgle i alle objekter" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Fjern egenskaber" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Åbn en liste over alle relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relationer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Åbn en editor for den valgte relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Slet de nvalgte relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Opret en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5458,5 +5480,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5468,14 +5490,14 @@ msgstr "Valgt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Frigør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Klik for at minimere/maksimere panelet" @@ -5556,12 +5578,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Konflikt i data" @@ -5579,5 +5601,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5585,5 +5607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5591,18 +5613,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5611,14 +5633,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5628,9 +5650,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5640,15 +5662,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5656,5 +5678,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5662,20 +5684,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5684,66 +5706,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Flyt det nuværende valgte medlem op" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Flyt det nuværende valgte medlem ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5752,9 +5774,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5763,41 +5785,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Hent alle ufuldstændige veje og punkter der er forbundet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Hent medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5807,19 +5829,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Henter udvidelsen {0}..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5840,10 +5869,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5857,5 +5882,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5925,9 +5950,9 @@ msgstr "Bogmærker" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5936,52 +5961,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min. bredde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min. længde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "maks. bredde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "maks. længde" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5991,52 +6016,52 @@ "området)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Omkransende område" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Datakilder og typer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Rå GPS-data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Hent som nyt lag" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6044,22 +6069,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Hent område" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Hent" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Området er for stort; vil sandsynligvis blive afvist af serveren" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -6067,17 +6092,17 @@ "serveren" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6099,21 +6124,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer-fejl, sikkert på grund af nogle manglende tags." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6852,8 +6877,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7026,5 +7051,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7036,5 +7061,5 @@ msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7081,5 +7106,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7093,5 +7118,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7102,5 +7127,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7109,19 +7134,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7131,32 +7156,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7178,5 +7203,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7238,12 +7263,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7268,33 +7293,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zoom til problem" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "historie" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7303,7 +7326,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "ikke slettet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7321,7 +7343,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7361,7 +7382,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonym" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7389,12 +7409,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Version {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "slettet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7452,10 +7471,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7666,5 +7685,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7687,17 +7706,17 @@ msgstr "Lag" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7713,7 +7732,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7756,29 +7775,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Send ændringer" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7786,38 +7805,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Angiv en kort kommentar for de ændringer, du uploader:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7825,16 +7844,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7878,24 +7897,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Billeder for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Indlæs GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Intet tidspunkt for punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7903,33 +7922,33 @@ msgstr "Indlæser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Ingen billeder med læsbare tidsstempler fundet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geotaggede billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS-start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS-slut: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "nuværende forskel: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "tidszone-forskel: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7938,14 +7957,14 @@ msgstr[1] "billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} inden for sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Synkronisér ur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7953,32 +7972,32 @@ msgstr "JPEG-billeder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datoen i filen \"{0}\" kunne ikke forstås." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Billede" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-enhedens tidszone (forskel fra foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisér tidspunkt med GPS-enhed" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Den indtastede tid kunne ikke forstås." @@ -8068,5 +8087,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8118,10 +8137,10 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Konvertér til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8131,11 +8150,11 @@ "
Hvis du vil uploade traces, så kig her:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8145,29 +8164,29 @@ msgstr "Konverteret fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Hent fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Hent alt inden for:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8178,10 +8197,10 @@ "du
at fortsætte?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8189,5 +8208,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8195,23 +8214,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "uden for det hentede område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8220,5 +8239,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8232,5 +8251,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8243,11 +8262,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8256,22 +8275,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API-version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Ingen \"fra\"-vej blev fundet." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8368,9 +8400,9 @@ msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Vis/skjul tekst/ikoner" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Skift synligheden for markør-tekst og -ikoner" @@ -8434,5 +8466,5 @@ "endnu)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8440,5 +8472,5 @@ msgstr "Vælg venligst rækken, der skal rettes." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8446,5 +8478,5 @@ msgstr "Ny værdi for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8453,5 +8485,5 @@ msgstr "Vælg venligst rækken, der skal slettes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Indtast et nyt nøgle/værdi-sæt" @@ -8574,40 +8606,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Farve" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Vælg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Vælg en farve for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Sæt til standardværdi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Sæt alle til standardværdi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Farver brugt af forskellige objekter i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Farver" @@ -9049,17 +9081,17 @@ msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Vis koordinater som" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projicerings-metode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9069,5 +9101,5 @@ msgstr "Kort-projicering" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9125,81 +9157,81 @@ msgstr "Genvej" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9208,6 +9240,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9381,10 +9413,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9394,13 +9426,13 @@ msgstr[1] "Fjern gamle nøgler fra op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9408,18 +9440,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Valgfri attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Ukendt type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9430,15 +9462,15 @@ msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Fejl ved fortolkning af {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementer af typen {0} er understøttet." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9448,18 +9480,18 @@ msgstr[1] "Ret {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Udvælgelse uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Anvend Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Ret egenskaber" @@ -9475,6 +9507,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9483,8 +9515,21 @@ msgstr "Kontakter OSM-serveren..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Henter punkter {0} til {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9601,11 +9646,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9615,40 +9660,40 @@ msgstr "Downloader OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9711,5 +9756,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9722,66 +9767,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Lukker rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Uploader..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9816,5 +9861,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9841,5 +9886,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9847,5 +9892,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9858,5 +9903,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10009,5 +10054,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10016,38 +10061,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10055,19 +10100,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Ufuldstændig -specifikation med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Ugyldigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10077,10 +10122,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10090,25 +10133,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10572,5 +10615,5 @@ msgstr "(teksten er allerede kopieret til til din udklipsholder.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10579,12 +10622,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10594,5 +10630,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10602,10 +10638,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10614,5 +10645,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10621,5 +10652,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10628,9 +10659,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10640,5 +10678,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10647,5 +10685,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10654,5 +10692,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10661,10 +10699,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10673,10 +10711,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10687,5 +10725,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10695,5 +10733,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11422,5 +11460,5 @@ msgstr "Fejl i fil {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11433,29 +11471,48 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Fejl ved indlæsning af fil" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambert Zone 1 cache-fil (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert Zone 1 cache-fil (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambert Zone 2 cache-fil (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambert Zone 3 cache-fil (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert Zone 4 cache-fil (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11484,13 +11541,13 @@ msgstr "Vælg fra..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11499,13 +11556,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11788,43 +11845,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambert-zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Hent lokalitet fra cache (kun hvis cachen er aktiveret)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Skift lokalitet" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11832,5 +11894,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11861,5 +11923,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Tilpas WMS" @@ -11887,5 +11949,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11893,28 +11955,28 @@ msgstr "Tomt lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11923,24 +11985,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12971,20 +13024,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Vil du tillade dette?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Bekræft Fjernbetjenings-handling" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13106,13 +13159,9 @@ msgstr "Reducer zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13685,6 +13734,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Uforbundne veje." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14335,12 +14385,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Hent" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Hent kort-data fra OSM serveren." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14356,9 +14404,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Der er ingen lag, kildelaget
\"{0}\"
kunne flettes sammen med." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14380,7 +14426,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Dublet-punkter" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14446,29 +14491,29 @@ msgstr "Ingen gyldig WMS-URL eller id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Tilpas positionen for det valgte WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14477,5 +14522,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14483,10 +14528,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14499,24 +14544,24 @@ msgstr "Automatisk download" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lag ({0}), henter automatisk til zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lag ({0}), henter til zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14527,13 +14572,13 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14542,44 +14587,49 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alpha-kanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Gem WMS-lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Gem WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Hent WMS-lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Hent WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Fil format fejl" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Bogmærker" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26906,8 +26956,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "usædvanlig kombination af tags" @@ -26927,34 +26976,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE-kort" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26964,9 +27002,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26980,25 +27021,114 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Der er ingen primitiver med versionen {0} i denne historik" - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Fandt ikke en primitiv med id {0} i dette datasæt" - -#~ msgid "help" -#~ msgstr "hjælp" - -#~ msgid "Help / About" -#~ msgstr "Hjælp / Om" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE-kort" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambert Zone 2 cache-fil (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambert Zone 3 cache-fil (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambert Zone 4 cache-fil (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambert Zone 2 cache-fil (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambert Zone 3 cache-fil (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambert Zone 4 cache-fil (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambert Zone 1 cache-fil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambert Zone 1 cache-fil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambert Zone 1 cache-fil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambert Zone 1 cache-fil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambert Zone 1 cache-fil (.1)" + +#~ msgid "Edit Properties" +#~ msgstr "Rediger egenskaber" #~ msgid "Move" @@ -27430,4 +27560,10 @@ #~ msgid "Public" #~ msgstr "Offentlig" + +#~ msgid "help" +#~ msgstr "hjælp" + +#~ msgid "Help / About" +#~ msgstr "Hjælp / Om" #~ msgid "viaduct" @@ -27661,4 +27797,7 @@ #~ "href=\"{1}\">dit sprog." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Fandt ikke en primitiv med id {0} i dette datasæt" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjælpesiden mangler. Opret den på ." @@ -27673,2 +27812,5 @@ #~ msgid "Unexpected return value. Got {0}." #~ msgstr "uventet svar. Modtog {0}" + +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Der er ingen primitiver med versionen {0} i denne historik" Index: applications/editors/josm/i18n/po/de.po =================================================================== --- applications/editors/josm/i18n/po/de.po (revision 18772) +++ applications/editors/josm/i18n/po/de.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-17 17:19+0100\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-24 10:31+0100\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:04+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:51+0000\n" "X-Generator: KBabel 1.11.4\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hilfe" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoriere die ungültige URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,23 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Warnung" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoriere die ungültige Datei-URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"Datei \"{0}\" kann nicht gelesen werden.
Fehler lautet:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,19 +116,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"Datei \"{0}\" kann nicht gelesen werden.
Fehler lautet:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -127,8 +125,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -138,21 +136,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -176,8 +174,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -190,6 +191,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Fehler" @@ -210,6 +211,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -311,5 +312,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -318,27 +319,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -356,5 +357,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Abbrechen" @@ -366,19 +367,19 @@ "oder Relation) auswählen." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Bitte die Zielebene auswählen." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Zielebene auswählen" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Vereinen" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -389,5 +390,5 @@ "werden könnte." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Keine Zielebenen" @@ -500,13 +501,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -604,20 +605,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Datei: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Es existieren keine offenen Änderungssätze" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Keine offenen Änderungssätze" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -657,10 +658,10 @@ "Reihenfolge gebracht werden)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0} Wege verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden." @@ -706,10 +707,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -728,11 +729,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Überschreiben" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Datei existiert bereits. Überschreiben?" @@ -779,5 +780,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -786,6 +787,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -801,7 +802,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -829,5 +829,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplizieren" @@ -851,30 +851,30 @@ msgstr "Programm beenden" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Alle Formate" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Als GPX exportieren..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Die Daten ins GPX-Format exportieren." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -882,13 +882,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -907,8 +907,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -916,7 +916,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -939,9 +939,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -953,5 +953,5 @@ msgstr "Parameter \"{0}\" darf nicht NULL sein" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -959,5 +959,5 @@ msgstr "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "GPX-Datei exportieren" @@ -1104,6 +1104,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Neu" @@ -1238,5 +1238,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Einfügen" @@ -1324,11 +1324,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Speichern" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Aktuelle Daten speichern." @@ -1385,10 +1385,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Speichern unter..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Aktuelle Daten in einer neuen Datei speichern." @@ -1407,29 +1407,29 @@ "unvöllständige Objekte ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Statusübersicht anzeigen" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Hilfe: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Statusbericht" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "In die Zwischenablage kopieren und schließen" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1601,5 +1601,5 @@ msgstr "Knotenpunkte getrennt" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1607,5 +1607,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1652,22 +1652,22 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Aktueller Datensatz wurde nicht gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" msgstr "Auswahl aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "Updates the currently selected objects from the server (re-downloads data)" msgstr "" @@ -1675,30 +1675,30 @@ "herunterladen)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Auswahl aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Auswahl leer" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" msgstr "Objekte aktualisieren" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Daten hochladen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "Alle Änderungen in der aktuellen Datenebene zum OSM-Server hochladen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1709,5 +1709,5 @@ "gelöst werden müssen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1715,29 +1715,29 @@ msgstr "Keine Änderungen zum Hochladen vorhanden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Nichts geändert. Erfassen Sie erst einige Daten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Nur Knoten {0} synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Nur Weg {0} synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Nur Relation {0} synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Ganzen Datensatz synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1759,11 +1759,11 @@ "abzubrechen und weiterzuarbeiten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Konflikte gefunden" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1779,5 +1779,5 @@ "weiterzuarbeiten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1791,22 +1791,22 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Änderungssatz geschlossen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "Bereinigen von Konflikten vorbereiten" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "Klicken, um alle Wege mit dem Knoten {0} zu laden" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "Klicken, um abzubrechen und das Editieren der Karte wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1822,10 +1822,10 @@ "Konfliktbearbeitungsdialog bereinigen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "Ein Knoten wird noch benutzt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" @@ -1834,9 +1834,9 @@ "überein" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Objekt aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1845,5 +1845,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1854,5 +1854,5 @@ "dieses Objekt und fahre mit dem Hochladen fort." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." @@ -1861,10 +1861,10 @@ "Objekt beim Hochladen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "Übertrage {0} Objekte zum Server ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1978,17 +1978,17 @@ msgstr "Langsamer abspielen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Hole GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Heruntergeladene GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "Ignoring exception because download has been cancelled. Exception was: {0}" @@ -1997,5 +1997,5 @@ "Fehlermeldung war: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "In diesem Gebiet wurden keine Daten gefunden." @@ -2059,9 +2059,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Fehler beim Herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "Fehler beim Herunterladen" @@ -2079,5 +2079,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2085,5 +2085,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2180,7 +2180,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen." +msgstr "" +"Erst einen Wegabschnitt senkrecht zu seiner Richtung bewegen, dann den " +"Mausknopf loslassen." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2189,9 +2190,10 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Einen Wegabschnitt bewegen, um ein Rechteck zu erstellen." +msgstr "" +"Bewege einen Wegabschnitt, um ein Rechteck zu erstellen. +Bewegen zum " +"Verschieben des Wegabscnittes entlang seiner Senkrechten." #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2205,5 +2207,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2223,17 +2225,17 @@ msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Elemente verschieben" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Verschieben" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Verschieben rückgängig machen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2246,13 +2248,13 @@ "Wollen Sie sie wirklich verschieben?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" @@ -2260,9 +2262,9 @@ "Punkt vereinigen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Maustaste loslassen, um das Drehen zu stoppen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2272,15 +2274,15 @@ "umschalten. Umschalt-Strg: drehen oder Auswahl ändern." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoomen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zoomen und Karte verschieben" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2290,10 +2292,10 @@ "runter, rechts; Zoom verschieben mit rechter Maus" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Suchen..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2302,42 +2304,41 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Bitte einen Filterbegriff eingeben:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Bitte einen Suchbegriff eingeben." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "Regulärer Ausdruck" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "Geben Sie einen Suchausdruck ein" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "Auswahl ersetzen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "zur Auswahl hinzufügen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "aus der Auswahl entfernen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "in der Auswahl suchen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "Groß-/Kleinschreibung beachten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "Regulärer Ausdruck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -2345,17 +2346,17 @@ "Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Berliner Straße\" - 'Berliner Straße' in einem Schlüssel oder Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Ber - 'Ber' irgendwo im Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - Schlüssel 'type' mit exakt dem Wert 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2365,33 +2366,33 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Ber - kein 'Ber' im Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - Schlüssel=foot mit beliebigem Wert." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Spezialsuchen:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "type: - type of the object (node, way, relation)" msgstr "type: - Typ des Objektes (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - Alle von diesem Nutzer geänderten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - Objekte mit der angegebenen ID (0 für neue Objekte)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - Objekte mit gegebener Knotenanzahl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2401,21 +2402,21 @@ "oder tags: min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - Alle geänderten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - Alle ausgewählten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - Alle unvollständigen Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - Alle Objekte ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "child expr - all children of objects matching the expression" msgstr "" @@ -2423,5 +2424,5 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "parent expr - all parents of objects matching the expression" msgstr "" @@ -2429,17 +2430,17 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "Nutzung von | oder OR zum Kombinieren mittels logischem Oder." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Nutzung von \" zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Nutzung von ( und ) zum Gruppieren von Ausdrücken." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2449,51 +2450,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Suche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Filter bestätigen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Suche starten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Nichts gefunden für Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nichts aus der Auswahl entfernt durch Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "{0} Treffer gefunden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2510,14 +2511,14 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2526,26 +2527,26 @@ "\"relation\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Unerwartete Daten: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Fehlendes Argument für 'OR'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Fehlendes Argument für 'NICHT'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Schließende Klammer erwartet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "Falsche Anzahl an Parametern für Merkmalsoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2556,9 +2557,9 @@ "oder -bereich, z.B. \"tags: 1\" oder \"tags:2-5\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Falsche Anzahl an Parametern für Knoten-Operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2569,5 +2570,5 @@ "oder -bereich, z.B. \"nodes:1-20\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2676,7 +2677,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2788,5 +2789,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Doppelter Konflikt" @@ -2814,5 +2815,5 @@ "''{1}'' nicht mehr vorhanden ist." -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2820,6 +2821,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "Kann unentschiedenen Konflikt nicht auflösen" @@ -2893,18 +2894,8 @@ msgstr "Löschbestätigung" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Konflikte im Löschstatus für {0} auflösen" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2939,10 +2930,10 @@ msgstr "Entferne einen Verweis der Relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Konflikte in der Elementenliste für Relation {0} auflösen" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2976,20 +2967,20 @@ msgstr "Abfolge" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "{0} Merkmalskonflikte im Knoten {1} auflösen" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "{0} Merkmalskonflikte im Weg {1} auflösen" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "{0} Merkmalskonflikte in Relation {1} auflösen" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -3011,10 +3002,10 @@ msgstr "Versionskonflikte für Relation {0} auflösen" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Konflikte in der Knotenliste des Weges {0} auflösen" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3058,5 +3049,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Neuer Wert" @@ -3112,10 +3103,10 @@ msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ungültige Einstellungen in den Zeilen {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3126,5 +3117,5 @@ "Verzeichnis \"{0}\" ist kein Verzeichnis ist." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3135,5 +3126,5 @@ "\"{0}\" ist kein Verzeichnis ist." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3144,5 +3135,5 @@ "nicht erstellt werden konnte." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3153,5 +3144,5 @@ "Einstellungsverzeichnis konnte nicht erstellt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "Warning: Missing preference file ''{0}''. Creating a default preference file." @@ -3160,5 +3151,5 @@ "Standardeinstellungen." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3169,5 +3160,5 @@ "Standardeinstellungen ersetzt." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3178,5 +3169,5 @@ "konnte nicht auf Standardwerte zurückgesetzt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3188,5 +3179,5 @@ "Standardwerten erstellt." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3197,10 +3188,10 @@ "konnte nicht auf Standardwerte zurückgesetzt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''" @@ -3287,25 +3278,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3313,5 +3304,5 @@ msgstr "Änderungssatz {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "Unable to add primitive {0} to the dataset because it's already included" @@ -3320,5 +3311,5 @@ "Datensatz enthalten ist" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3332,34 +3323,42 @@ "JOSM fortsetzen können." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +msgstr "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +"Beim Zusammenführen wurde das Ziel-Objekt für das Objekt mit ID {0} nicht " +"gefunden" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Fehlendes Argument für 'NICHT'." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" +"Beim Zusammenführen wurde der Ziel-Knoten für den Knnoten mit ID {0} nicht " +"gefunden" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "Versionsprotokoll für Relation {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" +"Beim Zusammenführen wurde die Ziel-Relation für die Relation mit ID {0} " +"nicht gefunden" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" msgstr "" +"Beim Zusammenführen wurde das Ziel-Objekt vom Type {0} für das Objekt mit ID " +"{1} nicht gefunden" #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3367,6 +3366,7 @@ "Keeping target object. " msgstr "" -"Mein Element mit der Nr. {0} in der Version {1} ist sichtbar, obwohl es in " -"der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin behalten. " +"Zielobjekt mit der ID {0} und Version {1} ist sichtbar obwohl das " +"Quellobjekt mit der niedrigeren Version {2} nicht sichtbar ist. Diese " +"Inkonsistenz konnte nicht gelöst werden. Zielobjekt beibehalten. " #. translators notes must be in front @@ -3423,33 +3423,37 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "Version > 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " "other is not" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +"Kann zwei Objekte nicht zusammenführen, weil eines der Objekte neu ist, das " +"andere aber nicht." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "Can''t merge primitives with different ids. This id is {0}, the other is {1}" msgstr "" +"Zwei Objekte mit unterschiedlichen IDs können nicht zusammengeführt werden. " +"Die ID des Objekts ist {0}, die ID des anderen {1}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37 @@ -3477,10 +3481,12 @@ "Schlüssel mit mehreren Werten enthält" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +"Ein Benutzer mit der gleichen ID aber mit einem unterschiedlichen Namen " +"wurde gefunden" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3647,10 +3653,10 @@ msgstr "Flächentext" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Fehler: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3662,6 +3668,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3671,5 +3677,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3679,6 +3685,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3696,6 +3702,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "Hintergrund" @@ -3713,24 +3719,35 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"WICHTIG: Einige Daten sind sehr weit von den\n" -"aktuellen Lambert-Zonengrenzen entfernt.\n" -"Laden Sie nach dieser Nachricht keine Daten hoch.\n" -"Machen Sie die letzte Aktion rückgängig, speichern Sie\n" -"die Daten und starten Sie eine neue Ebene mit der neuen Zone." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "4 Lambert-Zonen (Frankreich)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "{0} ({1} bis {2} Grad)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "{0} (Korsika)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "Lambert-CC-Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "Lambert-CC9-Zone (Frankreich)" @@ -3744,27 +3761,52 @@ msgstr "Merkator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "PUWG (polen)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "PUWG-Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "PUWG 1992 (Polen)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "PUWG-2000-Zone {0} (Polen)" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Swissgrid (Schweiz)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "UTM Zone" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "UTM20N Guadeloupe Fort-Marigot 1949" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "UTM20N Guadeloupe Ste-Anne 1948" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "Guadeloupe Fort-Marigot 1949" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "Guadeloupe Ste-Anne 1948" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "UTM 20N (Frankreich)" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "UTM20-Nord Geodätisches System" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3780,10 +3822,10 @@ msgstr "Konnte Lesezeichen nicht schreiben.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Nicht noch einmal zeigen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3791,32 +3833,32 @@ msgstr " [ID: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "unvollständig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "Straße" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "Eisenbahn" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "Gewässer" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "Landfläche" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3825,5 +3867,5 @@ msgstr[1] "{0} Knoten" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3861,6 +3903,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Konflikt" @@ -3870,11 +3912,11 @@ msgstr "Rechner unbekannt" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Objekt gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4085,11 +4127,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4204,5 +4246,5 @@ msgstr "Die Länge des neu zu zeichnenden Wegabschnittes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4212,18 +4254,18 @@ "halten, um mit der Maus aus der Liste zu wählen.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(kein Objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Nutzer:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "Ebene nicht in der Liste." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4353,50 +4395,50 @@ msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Eigenschaften" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Merkmale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Knoten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Elemente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Keine verbleibenden Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Merkmale ({0} Konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} verbleibende Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Knoten(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" @@ -4404,17 +4446,17 @@ "Knotenliste des Weges." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Knoten(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Verbleibende Konflikte in der Knotenliste des Weges" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Elemente(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4424,68 +4466,68 @@ "Elementenliste der Relation." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Elemente(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Verbleibende Konflikte in der Elementenliste der Relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Keine verbleibenden Eigenschaftskonflikte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Eigenschaften(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Verbleibende Eigenschaftskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Konfliktlösung" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "Liste in Role {0} nimmt aktuell nicht an einem Vergleichspaar teil." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "Parameter \"index\" hat unerwarteten Wert {0}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "Element {0} nicht in der Liste gefunden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "Synchron Rollen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Vergleichen " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Meine Version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Liste der Elemente in meinem (dem lokalen) Datensatz" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4493,5 +4535,5 @@ msgstr "Vereinigte Version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4501,30 +4543,30 @@ "hierdurch ersetzt, wenn die Änderungen bestätigt werden." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Deren Version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Liste der Elemente in deren (dem Server-) Datensatz" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> Kopf" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Kopiere meine gewählten Knoten an den Anfang der Liste vereinigter Knoten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> Fuß" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "Kopiere meine gewählten Elemente an das Ende der Liste vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4534,5 +4576,5 @@ "vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4542,5 +4584,5 @@ "Liste vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "Copy their selected element to the start of the list of merged elements." msgstr "" @@ -4548,9 +4590,9 @@ "Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4560,5 +4602,5 @@ "vereinigter Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4568,54 +4610,54 @@ "der vereinigten Liste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Hoch" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Den ausgewählten Eintrag eine Position nach oben schieben." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Runter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Den ausgewählten Eintrag eine Position nach unten schieben." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Fixieren" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Aktuelle Liste der vereinigten Elemente fixieren." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Fixierung aufheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Fixierung der aktuellen Liste der vereinigten Elemente aufheben." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4624,5 +4666,5 @@ msgstr "Wähle {0} um das Vereinigen zu beginnen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4631,5 +4673,5 @@ msgstr "Wähle {0} um das Vereinigen abzuschließen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4638,5 +4680,5 @@ msgstr[1] "Meine Version ({0} Einträge)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4645,5 +4687,5 @@ msgstr[1] "Vereinigte Version ({0} Einträge)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4652,6 +4694,6 @@ msgstr[1] "Deren Version ({0} Einträge)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4662,6 +4704,6 @@ "synchronen Anpassen teilnehmen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4672,5 +4714,5 @@ msgstr "Knoten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4684,5 +4726,5 @@ msgstr "Unerwarteter Spaltenindex ({0})" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4691,19 +4733,19 @@ msgstr "Fehler bei der Kommunikation mit dem Server
Details: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Fehler bei der Kommunikation mit dem Server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Ja, auch wiederherstellen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Nein, Operation abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4715,9 +4757,9 @@ "wiederhergestellt werden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Zusätzliche Knoten wiederherstellen?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4730,5 +4772,5 @@ "wiederhergestellt werden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Abhängige Objekte wiederherstellen?" @@ -4754,84 +4796,84 @@ msgstr "Koordinaten:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Löschstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Löschstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(nichts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "nicht gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "Sichtbar (auf Server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "nicht sichtbar (auf dem Server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Exakte Kopie der lokalen Version behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Aus dem lokalen Datensatz löschen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Behalte meine Koordinaten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Behalte Server-Koordinaten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Behalte den Löchstatus der lokalen Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Behalte den Löchstatus der Server-Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Übernehme meinen Löschstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Ja, diese ID zurücksetzten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Nein, abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4844,17 +4886,17 @@ "zuweisen.
Möchten Sie fortfahren?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "ID auf 0 zurücksetzen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Übernehme deren Löschstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Ja, Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4865,9 +4907,9 @@ "damit einverstanden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Aus dem Datensatz löschen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Löschstatus ist unterschiedlich." @@ -4884,19 +4926,19 @@ "ausgeführt werden." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4912,10 +4954,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4925,10 +4967,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4955,27 +4997,27 @@ msgstr "Deren Version (Serverdaten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der Server-Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Unentschieden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Gewähltes Merkmal als unentschieden markieren" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -5000,22 +5042,22 @@ msgstr "Es sind keine Konflikte zu lösen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Konfliktlösung abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Übernehme gelöste Konflikte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5023,5 +5065,5 @@ msgstr "Kein" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5114,6 +5156,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5124,5 +5166,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5136,21 +5178,21 @@ msgstr "pos {0} außerhalb des Wertebereiches. Aktuelle Mitgliederanzahl: {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "Lösche dieses Miglied aus der Relation." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 msgid "Keep" msgstr "Behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 msgid "Keep this relation member for the target object" msgstr "Behalte dieses Relations-Mitglied für das Ziel-Objekt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "Ungelöst." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "Noch ohne Lösung" @@ -5158,5 +5200,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Rolle:" @@ -5175,4 +5217,6 @@ "modified relations." msgstr "" +"Auswählen um ein Merkmal eingeben zu können, das allen veränderten " +"Relationen hinzugefügt wird." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106 @@ -5184,4 +5228,6 @@ msgid "Enter a tag key, i.e. fixme" msgstr "" +"Geben Sie den Schlüssel eines Merkmals ein, zum Beispiel " +"fixme" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 @@ -5192,4 +5238,6 @@ msgid "Enter a tag value, i.e. check members" msgstr "" +"Geben Sie den Wert eines Merkmals ein, zum Beispiel " +"Mitglieder überprüfen" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5201,4 +5249,10 @@ "place of the original way in the membership." msgstr "" +"Die vereinigten Wege sind Mitglieder in mindestens einer Relation. " +"Bitte entscheiden Sie, ob Sie die entsprechenden Relationsmitgliedschaften " +"behalten oder entfernen wollen.
Der " +"Standardwert ist behalten: der vereinigte Weg wird den " +"Platz der ursprünglichen Wege in den Relationsmitgliedschaften einnehmen." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132 @@ -5250,10 +5304,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5273,17 +5327,17 @@ msgstr "Befehlsliste: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "Konflikte auflösen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5293,25 +5347,25 @@ "Objekte setzen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Konfliktauflösung abbrechen und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Gelöste Konflikte anwenden und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Lösung anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Trotzdem schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Weiter auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5329,13 +5383,13 @@ "Konfliktlösung zurückzukehren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Konflikt konnte nicht vollständig gelöst werden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5347,8 +5401,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5415,5 +5469,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5447,34 +5501,34 @@ msgstr "Liste aller geladenen Ebenen öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Ausgewählte Ebene löschen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Anzeigen/Ausblenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Sichtbarkeit der Ebene umschalten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Die ausgewählte Ebene aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Aktuelle Eben mit einer anderen Ebene verbinden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Gewählte Ebene eine Zeile nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Gewählte Ebene eine Zeile nach unten verschieben." @@ -5484,5 +5538,5 @@ msgstr "Ebeneninformation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 #, java-format msgid "This will change {0} object." @@ -5491,10 +5545,10 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." msgstr "Ein leerer Wert löscht den Schlüssel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +#: ../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 @@ -5503,10 +5557,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Werte ändern?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5515,5 +5569,5 @@ msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5522,9 +5576,9 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Bitte wählen Sie einen Schlüssel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Bitte wählen Sie einen Wert" @@ -5548,82 +5602,78 @@ msgstr "Element von" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Eigenschaften hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Eigenschaften / Mitgliedschaften" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Relation ändern" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Aus der Relation entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Auswahl wirklich aus Relation {0} entfernen?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Den gewählten Schlüssel von allen Objekten entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Eigenschaften entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Eigenschaften bearbeiten" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Eigenschaften / Mitgliedschaften" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Relation ändern" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Aus der Relation entfernen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Auswahl wirklich aus Relation {0} entfernen?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Den gewählten Schlüssel von allen Objekten entfernen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Eigenschaften entfernen" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Eine Liste aller Relationen öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relationen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Editor für die gewählte Relation öffnen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Gewählte Relation löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Eine neue Relation erstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5631,21 +5681,21 @@ "öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "Mitglieder auswählen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "Alle Mitglieder der ausgewählten Relationen laden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "Elemente herunterladen" @@ -5674,5 +5724,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5684,9 +5734,9 @@ msgstr "Auswahl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Ansicht separat darstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" @@ -5694,5 +5744,5 @@ "Werkzeugleiste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" @@ -5763,9 +5813,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download all child relations (recursively)" -msgstr "Alle Child-Verknüpfungen herunterladen (rekursiv)" +msgstr "Alle Kind-Relationen herunterladen (rekusiv)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 msgid "Download All Children" -msgstr "Alle Child-Verknüpfungen herunter laden" +msgstr "Alle Kind-Relationen herunterladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 @@ -5775,15 +5825,15 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 msgid "Download Selected Children" -msgstr "Ausgewählte Child-Verknüpfungen herunter laden" +msgstr "Ausgewählte Kind-Relationen herunterladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Relationselemente herunterladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Konflikte in den Daten" @@ -5803,5 +5853,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5809,5 +5859,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5815,18 +5865,18 @@ msgstr "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Merkmale und Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" -msgstr "Relationen der Eltern" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +msgstr "Eltern-Relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" -msgstr "Child-Verknüpfungen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +msgstr "Kind-Relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5838,14 +5888,14 @@ "Sie die zirkuläre Abhängigkeit behandeln?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Objekt entfernen und Verbindung lösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Ignorieren und die aktuelle Verbindung belassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5857,9 +5907,9 @@ "

Wollen Sie es ein weiteres Mal in die Relation aufnehmen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Mehrere Elemente verweisen auf das gleiche Objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5872,5 +5922,5 @@ "Relation ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "Add all primitives selected in the current dataset before the first member" msgstr "" @@ -5878,5 +5928,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "Add all primitives selected in the current dataset after the last member" msgstr "" @@ -5884,5 +5934,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5892,5 +5942,5 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5900,19 +5950,19 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Relations-Editor: Ausgewählte entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "Select relation members which refer to primitives in the current selection" msgstr "Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5923,53 +5973,53 @@ "Auswahl vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "Objekte für gewählte Relationselemente auswählen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Relationselemente sortieren" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Relations-Editor: Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Ausgewählte Elemente nach oben schieben" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Relations-Editor: Nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Ausgewählte Elemente nach unten schieben" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Relations-Editor: Nach unten verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Relations-Editor: Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Die aktuell bearbeitete Beziehung löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Konflikt erstellen und schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "" @@ -5977,9 +6027,9 @@ "schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "Click to to return to the relation editor and to resume relation editing" msgstr "" @@ -5987,5 +6037,5 @@ "Relation wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5997,9 +6047,9 @@ "

Soll ein Konflikt erstellt und der Editor geschlossen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Datenkonflikt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -6010,41 +6060,41 @@ "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Aktualisierung übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Updates anwenden und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Updates abbrechen und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Einen leeren Schlüssel hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Relations-Editor: Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Definiert eine Rolle für die ausgewählten Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Rolle anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -6057,19 +6107,26 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "Nicht übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Leere Rolle bestätigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, java-format +msgid "Downloading relation ''{0}''" +msgstr "Relation ''{0}'' herunterladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -6092,11 +6149,7 @@ msgstr "Zoom ist deaktiviert, weil kein Element ausgewählt wurde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Referenziert auf" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Verknüpft" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6109,5 +6162,5 @@ msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6181,9 +6234,9 @@ msgstr "Lesezeichen" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "Es ist kein Ladebereich ausgewählt." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6194,13 +6247,13 @@ "Br., max. Län.): {0}, {1}, {2}, {3}" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "Lesezeichen erstellen" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "Fügen Sie ein Lesezeichen für den aktuellen Ladebereich hinzu" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "Currently, there is no download area selected. Please select an area first." msgstr "" @@ -6208,39 +6261,39 @@ "aus." +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." +msgstr "Bitte geben Sie einen Namen für das Lesezeichen ein." + #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "Bitte geben Sie einen Namen für das Lesezeichen ein." - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "Name des Ortes" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "Entfernt die ausgewählten Lesezeichen" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "Benennt das ausgewählte Lesezeichen um" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min Breite" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min Länge" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max Breite" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max Länge" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6250,52 +6303,52 @@ "zu laden)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Koordinaten" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "Die Zeichenkette ''{0}'' ist kein gültiger Gleitkommawert." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "Als Breitengrad wird ein Wert im Intervall [-90,90] erwartet." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "AlsLängengrad wird ein Wert im Intervall [-180,180] erwartet." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "URL aus der Zwischenablage einfügen" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Datenquellen und Typen" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap-Daten" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "Auswählen, um OSM-Datenobjekte im ausgewählten Ladebereich zu laden." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "GPS-Rohdaten" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "Auswählen, um GPS-Spuren im ausgewählten Ladebereich zu laden." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Als neue Ebene laden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6305,38 +6358,38 @@ "um in die aktuelle Daten-Ebenen zu laden." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Bereich laden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "Es ist kein Bereich ausgewählt" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich verbieten" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Bereich korrekt, Größe ist wahrscheinlich akzeptabel für den Server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "Klicken, um das Fenster zu schließen und das Herunterladen abzubrechen" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "Klicken, um den aktuellen Ladebereich zu laden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "Bitte wählen Sie zunächst einen Ladebereich aus." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6361,21 +6414,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "Suchen..." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "Klicken, um die Suche nach Orten zu starten" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "Suche nach Namen" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "Suche nach Namen ..." @@ -7114,8 +7167,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7288,5 +7341,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7298,5 +7351,5 @@ msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "In der Nähe von" @@ -7349,5 +7402,5 @@ msgstr "JOSM-Hilfeanzeiger" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7369,5 +7422,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7382,5 +7435,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7391,19 +7444,19 @@ "
Vermutlich ist Ihre Internet-Verbindung unterbrochen." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "Die URL konnte nicht geöffnet werden" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "Aktuelle Hilfeseite in einem externen Browser öffnen" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "Die aktuelle Hilfeseite bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7415,32 +7468,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "Die aktuelle Hilfeseite neu laden" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "Zur vorherigen Seite gehen" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "Zur nächsten Seite gehen" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "Gehe zur Start-Seite für die JOSM-Hilfe" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "Warnung: Falsche Position im HTML Dokument. Der Fehler war: " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 msgid "Failed to open help page. The target URL is empty." msgstr "Die Hilfe-Seite konnte nicht geöffnet werden. Die Ziel-URL ist leer." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 msgid "Failed to open help page" msgstr "Die Hilfe-Seite konnte nicht geladen werden" @@ -7464,5 +7517,5 @@ msgstr "Länge: " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "Koordinaten" @@ -7560,31 +7613,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Knoten {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 msgid "Zoom to node" msgstr "Zoom auf Knoten" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgstr "Zu diesem Knoten in der aktuellen Daten-Ebene zoomen" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 msgid "Show history" msgstr "Versionsprotokoll anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +msgstr "Browser mit dem Versionsprotokoll dieses Knotens öffnen" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Weg {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7610,7 +7663,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7638,7 +7690,9 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in layer ''{1}''" -msgstr "Version {0} erstellt am {1}" +msgstr "" +"Version {0} wird momentan in Ebene ''{1}'' " +"bearbeitet" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7684,7 +7738,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Version {0} erzeugt am {1} von {2}" +msgstr "Version {0} wird momentan in Datenebene ''{1}'' bearbeitet" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7739,10 +7793,10 @@ msgstr "Änderungssatz {0} schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "Auswahldialog für Datei öffnen" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Dateinamen wählen" @@ -7981,5 +8035,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -8002,17 +8056,17 @@ msgstr "Ebene" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Hochladen empfohlen?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Speichern empfohlen?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Dateiname" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -8030,7 +8084,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Merkmale des neuen Änderungssatzes" @@ -8073,29 +8127,29 @@ msgstr[1] "{0} zu löschende Objekte:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Änderungen hochladen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Geänderte Objekte hochladen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "Bitte gib einen Kommentar für den Änderungssatz ein. (mind. 3 Zeichen)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "Ungültiger Kommentar" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Hochladen abbrechend und Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Alle Änderungen in einer Anfrage hochladen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -8105,38 +8159,38 @@ "Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt." -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Ein kurzer Kommentar über die hochzuladenden Änderungen:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Neuen Änderungssatz öffnen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Offenen Änderungssatz verwenden" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Daten in einen vorhandenen, offenen Änderungssatz hochladen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Änderungssatz nach dem Hochladen schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "Auswählen, um den Änderungssatz nach dem nächsten Hochladen zu schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -8144,16 +8198,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Liste Ihrer offenen Änderungssätze vom Server laden" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Ausgewählten offenen Änderungssatz schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8203,24 +8257,24 @@ msgstr "Mit Hochladen fortfahren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Bilder für {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "GPX lesen..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Keine Zeit für Punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8228,33 +8282,33 @@ msgstr "Einlesen {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Georeferenzierte Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS Start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS Ende: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "Aktueller Unterschied: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "Zeitzonen Unterschied: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8263,14 +8317,14 @@ msgstr[1] "Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} innerhalb der GPS-Spur." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Uhrzeit synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8278,32 +8332,32 @@ msgstr "JPEG-Bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Zeit mit GPS-Gerät synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." @@ -8393,5 +8447,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8443,10 +8497,10 @@ msgstr[1] "{0} Wegpunkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Zur Daten-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8456,11 +8510,11 @@ "
Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8470,29 +8524,29 @@ msgstr "Konvertiert von: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "OSM-Daten entlang der GPS-Spur herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Alles im Bereich herunterladen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} Meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Maximalgebiet je Anfrage:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8503,5 +8557,5 @@ "fortfahren?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -8509,5 +8563,5 @@ "werden kann." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8517,5 +8571,5 @@ "wurden ignoriert oder an den Anfang verschoben." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8525,23 +8579,23 @@ "der GPS-Spur entfernt waren, wurden ignoriert." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datenebene {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "Außerhalb des heruntergeladenen Bereichs" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8550,5 +8604,5 @@ msgstr[1] "{0} Konflikte wurden entdeckt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8568,5 +8622,5 @@ "dem Server gelöscht wurden." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8583,11 +8637,11 @@ "Dialog und lösen Sie sie manuell." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8596,22 +8650,34 @@ msgstr[1] "{0} gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "nicht angegeben" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API-Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Zu GPX-Ebene konvertieren" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "Keine Probleme gefunden" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8713,9 +8779,9 @@ "Offset abgeleitet werden könnte." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Texte/Symbole anzeigen/verbergen" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten." @@ -8781,5 +8847,5 @@ msgstr "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8787,5 +8853,5 @@ msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8793,5 +8859,5 @@ msgstr "Neuer Wert für {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8800,5 +8866,5 @@ msgstr "Bitte wählen Sie die zu löschende Zeile." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Ein neues Schlüssel/Wert-Paar hinzufügen." @@ -8935,40 +9001,40 @@ msgstr "Kalibrierung der Tonaufzeichnung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Farbe" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Zeichenstil {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Ebene: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Wählen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Eine Farbe für {0} auswählen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Voreinstellung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Voreinstellung für alle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Farben, die von verschiedenen Objekten in JOSM verwendet werden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Farben" @@ -9415,17 +9481,17 @@ msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Koordinaten anzeigen als" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projektionsmethode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "Projektionsbezeichnung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "Grenzen" @@ -9435,5 +9501,5 @@ msgstr "Projektionsmethode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9493,81 +9559,81 @@ msgstr "Tastaturkürzel" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "Aktive Stile" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "Verfügbare Stile (von {0})" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Symbolpfad" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Kurzbeschreibung: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Autor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Webseite: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "Füge einen Dateinamen oder eine URL für einen aktiven Stil hinzu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "Entfernt die ausgewählten Stile von der Liste der aktiven Stile" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "Dateiname oder URL für den ausgewählten Stil ändern" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "Ausgewählte verfügbare Stile zu der Liste der aktiven Stile hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "Liste der verfügbaren Stile von ''{0}'' laden" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "Neuen Pfad für Symbole hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "Ausgewählte Pfade für Symbole entfernen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "Ausgewählten Pfad für Symbole ändern" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "Verfügbare Stile von ''{0}'' laden" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9578,6 +9644,6 @@ "

Details:
{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9767,10 +9833,10 @@ msgstr "Steuertastengruppen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9780,13 +9846,13 @@ msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Neues Tag hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Auswahl in der Merkmalstabelle löschen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9794,18 +9860,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Optionale Attribute:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "geschlossener Weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Unbekannter Typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9816,15 +9882,15 @@ msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Fehler beim Einlesen von {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente des Typs {0} werden unterstützt." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9834,18 +9900,18 @@ msgstr[1] "Ändere {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -9861,6 +9927,6 @@ msgstr "Vorlagengruppe {0}" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9869,8 +9935,21 @@ msgstr "Verbindung zum OSM-Server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Punkte {0} bis {1} werden heruntergeladen..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "Die Zeichenkette ''{0}'' konnte nicht in ein Datum umgewandelt werden." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\"" #. SAXException does not chain correctly @@ -9987,5 +10066,5 @@ msgstr "Unbekannter Modus {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -9994,6 +10073,6 @@ "unklar." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -10003,40 +10082,40 @@ msgstr "OSM-Daten herunterladen..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Knoten mit der ID {0} von \"{1}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Weg mit der ID {0} von \"{1}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Relation mit der ID {0} von \"{1}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Mehrere Knoten von \"{0}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Mehrere Wege von \"{0}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Mehrere Relationen von \"{0}\" abrufen" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10101,5 +10180,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -10113,61 +10192,61 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Änderungssatz erstellen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Änderungssatz {0} erfolgreich geöffnet" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Änderungssatz aktualisieren..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Änderungssatz {0} aktualisieren..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Änderungssatz schließen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Daten hochladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Warte 10 Sekunden... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Starte Versuch {0} von {1} in {2} Sekunden..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - erneuter Versuch." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starte Wiederholung {0} von {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -10176,5 +10255,5 @@ "ist {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10211,5 +10290,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10238,5 +10317,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10244,5 +10323,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10255,5 +10334,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10419,5 +10498,5 @@ msgstr "Die Datei \"{0}\" existiert nicht" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10428,19 +10507,19 @@ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "Das XML-Element ist kein unmittelbares Kindelement von ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf des Wegs {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10448,20 +10527,20 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "Ungültiger Wert \"{1}\" für Attribut \"ref\" bei Element der Relation {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." @@ -10470,9 +10549,9 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Unvollständige -Beschreibung mit ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." @@ -10481,10 +10560,10 @@ "Dieses wird ignoriert." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Illegales Objekt mit id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10496,10 +10575,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10512,25 +10589,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Fehlendes erforderliches Attribut \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "Way with external ID ''{0}'' includes missing node with external ID ''{1}''." @@ -10787,4 +10864,7 @@ "Update plugins now?" msgstr "" +"Sie haben eine neue Version der JOSM-Software installiert.\n" +"Um Probleme zu vermeiden, sollten Sie auch Ihre Plugins aktualisieren.\n" +"Sollen die Plugins jetzt erneuert werden?" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114 @@ -10796,9 +10876,9 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 msgid "Update plugins" -msgstr "" +msgstr "Plugins aktualisieren" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123 msgid "Skip update" -msgstr "" +msgstr "Aktualisierung überspringen" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 @@ -11013,5 +11093,5 @@ msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -11023,15 +11103,5 @@ "Internetverbindung." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" -"Änderungssatz \"{0}\" konnte auf dem OSM-Server \"{1}\" nicht " -"geschlossen werden.
Der Änderungssatz wird vom Server nach einem " -"Zeitablauf automatisch geschlossen." - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -11045,5 +11115,5 @@ "{0} und laden Sie erneut hoch." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -11056,10 +11126,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "Die Zeichenkette ''{0}'' konnte nicht in ein Datum umgewandelt werden." - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -11070,5 +11135,5 @@ "
weil der Änderungssatz bereits geschlossen wurde." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -11079,5 +11144,5 @@ "
weil der Änderungssatz bereits am {1} geschlossen wurde." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -11085,10 +11150,21 @@ "(untranslated):
{0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +"Der Server zeigt an, dass er einen Konflikt entdeckt hat.
Die " +"Fehlermeldung ist:
{0}" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "Der Server hat einen Konflikt identifiziert." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, fuzzy, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" +"Schließen des Änderungssatzes {0} ist fehlgeschlagen," +"
weil der Änderungssatz bereits am {1} geschlossen wurde." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -11101,5 +11177,5 @@ "Applet
nicht von ''{1}'' geladen." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -11110,5 +11186,5 @@ "fehlgeschlagen.
Bitte prüfen Sie die Internetverbindung." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -11119,5 +11195,5 @@ "Herunterladen.
Details: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -11129,10 +11205,10 @@ "später erneut." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "Der OSM-Server \"{0}\" meldet eine Fehlerhafte Anfrage.
" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -11144,10 +11220,10 @@ "Datenbankexport." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "
Fehlermeldung (englisch): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -11162,5 +11238,5 @@ "
Bitte überprüfen Sie die Server-Adresse ''{0}'' sorgfältig." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -11174,5 +11250,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11645,5 +11721,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126 msgid "One of the selected files was null" -msgstr "" +msgstr "Eine der ausgewählten Dateien war nicht vorhanden." #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:132 @@ -11941,5 +12017,5 @@ msgstr "Fehler bei Datei {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11955,29 +12031,46 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "Feuille auswählen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "Lambert-Zone 1 Zwischenspeicherdatei (.1)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "Lambert-Zone 2 Zwischenspeicherdatei (.2)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "Lambert-Zone 3 Zwischenspeicherdatei (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert-Zone 4 Zwischenspeicherdatei (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "Lambert-Zone {0} Zwischenspeicherdatei (.{0})" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert-CC9-Zone {0} Zwischenspeicherdatei (.CC{0})" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "Guadeloupe Fort-Marigot Zwischenspeicherdatei (.UTM1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "Guadeloupe Ste-Anne Zwischenspeicherdatei (.UTM2)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" +msgstr "Martinique Fort Desaix Zwischenspeicherdatei (.UTM3)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -12008,13 +12101,13 @@ msgstr "Wähle aus..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Automatische Quellenangabe" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12027,13 +12120,13 @@ "Wollen Sie wieder zum Bilder holen nutzen?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "Tastaturkürzel wiederherstellen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM wird zum Aktivieren der Änderung beendet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "Warning: failed to put option pane dialog always on top. Exception was: {0}" @@ -12343,43 +12436,48 @@ msgstr "Setze {0} Lambert-Koordinaten" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "Setzen Sie die Lambert-Zone manuell" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambert-Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Position aus dem Zwischenspeicher laden (nur wenn er aktiviert ist)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "{0} ist in der aktuellen Projektion nicht erlaubt" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Lambert-Zone {0} im Cache ist mit der gegenwärtigen Lambert-Zone {1} " +"inkompatibel" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Ort ändern" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Für die nächste Anfrage eine neue Position setzen" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Neue Ebene hinzufügen" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Ort" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12389,5 +12487,5 @@ "bekannte Syntax." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Eine neue Ebene hinzufügen" @@ -12418,5 +12516,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "WMS justieren" @@ -12448,5 +12546,5 @@ "Bitte eine auswählen und erneut versuchen." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12454,28 +12552,28 @@ msgstr "Leere Ebene" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Ist nicht vektorisiert." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "Rastergröße: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Ist vektorisiert." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Kommunen-Koordinatenfenster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12487,9 +12585,9 @@ "Erzeuge eine neue Datei." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Zwischenspeicher-Formatfehler" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12498,20 +12596,7 @@ "inkompatibel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Lambert-Zonenfehler zwischenspeichern" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" -"Aktuelle Ebene ist in der Lambert CC9 Zone \"{0}\"\n" -"während sich die Kommune in der Lambert CC9 Zone \"{1}\" befindet.\n" -"Lade deine Änderungen hinauf, schließe alle Ebenen und ändere\n" -"manuell die Lambert Zone im Katastermenü" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13519,5 +13604,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62 msgid "PicLayer" -msgstr "" +msgstr "BildEbene" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 @@ -13577,16 +13662,16 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Soll dies erlaubt werden?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Fernsteueraktion bestätigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" @@ -13594,5 +13679,5 @@ "erstellen kann." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:" @@ -13692,5 +13777,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148 msgid "Auto Zoom" -msgstr "" +msgstr "Autom. Zoom" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157 @@ -13700,5 +13785,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167 msgid "Show Tile Info" -msgstr "" +msgstr "Kachelinformationen anzeigen" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189 @@ -13714,13 +13799,9 @@ msgstr "Zoom reduzieren" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Kachel-Zwischenspeicher leeren" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "Bild " @@ -13757,5 +13838,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63 msgid "Min zoom lvl: " -msgstr "" +msgstr "Min. Zoomstufe: " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67 @@ -14302,6 +14383,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +msgid "Unconnected coastline" +msgstr "Nicht verbundene Küstenlinie" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14962,20 +15043,18 @@ #, java-format msgid "Walking Papers layer ({0}) in zoom {1}" -msgstr "" +msgstr "WalkingPapers-Ebene ({0}) mit Zoom {1}" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28 msgid "Walking Papers" -msgstr "Laufkarten (Arbeitskarten zum Drucken, Bearbeiten, Scannen)" +msgstr "WalkingPapers" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Daten herunterladen" +msgstr "Wege-Herunterladen" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Kartendaten vom OSM-Server laden." +msgstr "Kartendaten mit Anschluss zu einem der Wegenden herunterladen" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14985,15 +15064,18 @@ "an entire way first." msgstr "" +"Weder ein Knoten noch ein Weg mit einem Endpunkt ausserhalb " +"des
aktuellen Ladebereichs ist ausgewählt.
Wählen Sie zunächst einen " +"Knoten am Anfang oder Ende eines Weges oder den ganzen Weg aus." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:106 msgid "Could not find a unique node to start downloading from." msgstr "" +"Es gibt nicht genau einen Knoten, von dem ausgehend das Herunterladen " +"gestartet werden könnte." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." -msgstr "" -"Es gibt keine Ebene mit der die Ausgangsebene
''{0}''
vereint " -"werden könnte." +msgstr "Es sind keine Weg mit dem Knoten ''{0}'' verbunden. Abbruch." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -15003,4 +15085,6 @@ "discovered after download" msgstr "" +"Problem mit der Datenkonsistenz. Der vorher verbundene Weg ''{0}'' ist nach " +"dem Herunterladen verschwunden" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182 @@ -15013,14 +15097,17 @@ "continue way downloading?" msgstr "" +"Es gibt keinen weiteren Weg zum herunterladen,
aber eine " +"potentielle Doublette des ausgewählten Knotens wurde gefunden.

Der " +"ausgewählte Knoten ist ''{0}''.
Die potentielle Doublette is ''{1}''." +"
Soll die potentielle Doublette mit dem ausgewählten Knoten " +"zusammengeführt und das Herunterladen fortgesetzt werden?" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Doppelte Knoten entfernen..." +msgstr "Doppelten Knoten zusammenführen?" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 -#, fuzzy msgid "No more connected ways to download." -msgstr "Es ist kein Ladebereich ausgewählt." +msgstr "Keine weiteren verbundenen Wege zum Herunterladen." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221 @@ -15028,4 +15115,6 @@ msgid "Node ''{0}'' is a junction with more than 2 connected ways." msgstr "" +"Der Knoten ''{0}'' ist ein Verbindungsknoten mit mehr als 2 verbundenen " +"Wegen." #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 @@ -15084,29 +15173,29 @@ msgstr "Keine gültige WMS-URL oder ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Die Position der gewählten WMS-Ebene anpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Bitte wählen Sie die zu justierende WMS-Ebene." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "WMS-Ebene wählen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Justierung starten" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "Es existieren momentan keine justierbaren WMS-Ebenen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "Keine Ebenen zum justieren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -15115,5 +15204,5 @@ msgstr "Achtung: Die Adresse \"{0}\" des WMS-Dienstes enhällt kein '&' oder '?'." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -15123,10 +15212,10 @@ "Einstellungen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "Achtung: Die vollständige URL lautet \"{0}\"" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -15141,5 +15230,5 @@ msgstr "Automatisches Laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -15148,19 +15237,19 @@ "ungültiges Format hat" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(deaktiviert)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -15175,13 +15264,13 @@ "heruntergeladen werden?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Ja, Kacheln herunterladen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "Ungültige URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" @@ -15189,44 +15278,48 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Fehlerhafte Kacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "WMS-Ebene speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "WMS-Ebene aus Datei laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "WMS-Ebene laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Dateiformatfehler" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +msgid "Set WMS Bookmark" +msgstr "WMS_Lesezeichen erstellen" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -19696,5 +19789,5 @@ #: build/trans_presets.java:1841 msgid "Palaeontological Site" -msgstr "" +msgstr "Paläontologische Stätte" #. item "Historic Places/Palaeontological Site" @@ -19702,5 +19795,5 @@ #: build/trans_presets.java:1843 msgid "Edit Palaeontological Site" -msgstr "" +msgstr "Paläontologische Stätte bearbeiten" #. item "Historic Places/Palaeontological Site" text "Name" @@ -27585,8 +27678,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "Ungewöhnliche Schlüssel/Wert-Kombinationen" @@ -27606,34 +27698,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE-Karten" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE-Karten (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27643,9 +27724,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Straßen NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27659,12 +27743,69 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Tschechien CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Tschechien UHUL:ORTOFOTO" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE-Karten" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE-Karten (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + Index: applications/editors/josm/i18n/po/el.po =================================================================== --- applications/editors/josm/i18n/po/el.po (revision 18772) +++ applications/editors/josm/i18n/po/el.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-17 11:00+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 17:54+0000\n" "Last-Translator: alichani \n" "Language-Team: Greek \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:04+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Βοήθεια" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Προειδοποίηση" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Σφάλμα" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -302,5 +303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -309,27 +310,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -347,5 +348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Ακύρωση" @@ -355,19 +356,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Συγχώνευση" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -376,5 +377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -487,13 +488,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -591,20 +592,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Αρχείο: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Δε υπάρχουν ανοιχτές ομάδες αλλαγών" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Καμία ανοιχτή ομάδα αλλαγών" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -640,10 +641,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Ένωσε {0} δρόμους" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "" @@ -687,10 +688,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -709,11 +710,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Αντικατάσταση" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Το αρχείο υπάρχει. Αντικατάσταση;" @@ -761,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -768,6 +769,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -783,7 +784,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Αντιγραφή" @@ -833,30 +833,30 @@ msgstr "Έξοδος από την εφαρμογή" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Όλοι οι τύποι" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Εξαγωγή σε GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Τίποτα προς εξαγωγή. Λάβετε κάποια δεδομένα πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -864,13 +864,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -889,8 +889,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -898,7 +898,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -921,9 +921,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -935,5 +935,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -941,5 +941,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Εξαγωγή αρχείου GPX" @@ -1085,6 +1085,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Νέα" @@ -1213,5 +1213,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Επικόλληση" @@ -1299,11 +1299,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Αποθήκευση" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Αποθήκευση τεχόντων δεδομένων." @@ -1358,10 +1358,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Αποθήκευση ως..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο." @@ -1378,10 +1378,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Προβολή Αναφοράς Κατάστασης" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1389,20 +1389,20 @@ "επισυναφθούν σε σφάλματα" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Βοήθεια: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Αναφορά Κατάστασης" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Αντιγραφή στο πρόχειρο και κλείσιμο" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1560,5 +1560,5 @@ msgstr "Ξεκολημένος Κόμβος" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1566,5 +1566,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1611,55 +1611,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Ενημέρωση επιλογών" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Ενημέρωση Επιλογής" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Αντιγραφή επιλεγμένων αντικειμένων στο πρόχειρο." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Κενή επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Ενημέρωση επιλογών" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Αποστολή δεδομένων" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1668,5 +1665,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1674,29 +1671,29 @@ msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1710,11 +1707,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1725,5 +1722,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1733,22 +1730,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1759,19 +1756,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1780,5 +1777,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1787,15 +1784,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1907,17 +1904,17 @@ msgstr "Πιο αργά μπροστά" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Λήψη δεδομένων GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Λήψη Δεδομένων GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Λήψη δεδομένων" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1925,5 +1922,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1977,9 +1974,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Σφάλματα κατά την λήψη" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -1997,5 +1994,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2003,5 +2000,5 @@ msgstr "Κατάσταση: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2096,16 +2093,13 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 +msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Σχεδιάστε ένα παραλληλόγραμο του επιθυμητού μεγέθους, και αφήστε το πλήκτρο " "του ποντικιού." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Σχεδιάστε ένα παραλληλόγραμο του επιθυμητού μεγέθους, και αφήστε το πλήκτρο " -"του ποντικιού." - #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 msgid "" @@ -2122,5 +2116,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2140,17 +2134,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2160,9 +2154,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -2170,5 +2164,5 @@ "τετράγωνο" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2177,9 +2171,9 @@ "συγχώνευση με το πλησιέστερο κόμβο." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2187,15 +2181,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Ζουμ" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Ζουμ και μετακίνηση χάρτη" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2205,10 +2199,10 @@ "+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Αναζήτηση..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2217,59 +2211,59 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "αντικατάσταση επιλογής" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "προσθήκη στην επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "αφαίρεση από την επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "case sensitive" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "regular expression" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Baker Street - 'Baker' και 'Street' σε οποιοδήποτε κλειδί ή όνομα." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' και 'Street' σε οποιοδήποτε κλειδί ή όνομα." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' οπουδήποτε στο όνομα." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2277,34 +2271,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - χωρίς 'Bak' στο όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - κλειδί=foot ορισμένο με οποιαδήποτε τιμή." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +msgid "Special targets:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2312,43 +2306,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - όλα τα αλλαγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - όλα τα επιλεγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - όλα τα ημιτελή αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - όλα τα αντικείμενα χωρίς ετικέτες" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2358,51 +2352,51 @@ msgstr "Φίλτρο" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Αναζήτηση" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Έναρξη αναζήτησης" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Βρέθηκαν {0} αποτελέσματα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2416,40 +2410,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Αναμενόταν κλείσιμο παρένθεσης." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2458,9 +2452,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2469,5 +2463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2567,7 +2561,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2677,5 +2671,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2700,5 +2694,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2706,6 +2700,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2775,17 +2769,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2819,10 +2803,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2855,20 +2839,20 @@ msgstr "Ακολουθία" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2890,10 +2874,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2935,5 +2919,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Καινούργια τιμή" @@ -2989,10 +2973,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3001,5 +2985,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3008,5 +2992,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3015,5 +2999,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3022,5 +3006,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3028,5 +3012,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3035,5 +3019,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3042,5 +3026,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3049,5 +3033,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3056,10 +3040,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3140,25 +3124,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "Ν" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "Β" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "Δ" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "Α" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3166,5 +3150,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3172,5 +3156,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3180,26 +3164,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3208,5 +3192,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3269,24 +3253,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3294,5 +3278,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3320,10 +3304,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3488,10 +3472,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Σφάλμα: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3503,6 +3487,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3512,5 +3496,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3520,6 +3504,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3537,6 +3521,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "φόντο" @@ -3554,24 +3538,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"ΣΗΜΑΝΤΙΚΟ : τα δεδομένα βρίσκοντε πολύ μακριά από\n" -"τα τρέχοντα όρια της ζώνης Lambert.\n" -"Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα.\n" -"Αναιρέστε την τελυταία σας ενέργεια. Αποθηκεύστε την εργασία σας\n" -"και ξεκινήστε νέο επίπεδο στην νέα ζώνη." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Ζώνη Lambert" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3585,26 +3581,52 @@ msgstr "Μερκατορικός" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Ζώνη" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Ελβετικό πλέγμα (Ελβετία)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3619,10 +3641,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Να μην εμφανιστεί ξανά" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3630,32 +3652,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "μη ολοκληρωμένη" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "Οδός ταχείας κυκλοφορίας" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "σιδηρόδρομος" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "υδατόρρευμα" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "χρήση γής" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3664,5 +3686,5 @@ msgstr[1] "{0} κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3700,6 +3722,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Διένεξη" @@ -3709,11 +3731,11 @@ msgstr "Άγνωστος υπολογιστής" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3915,11 +3937,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4034,5 +4056,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4040,18 +4062,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(κανένα αντικείμενο)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "το επίπεδο δεν είναι στη λίστα." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4172,67 +4194,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Ιδιότητες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Ετικέτες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Μέλη" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4240,68 +4262,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Επίλυση σύγκρουσης" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "το αντικείμενο {0} δεν βρέθηκε στην λίστα" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "κλείδωμα κύλισης" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Σύγκριση " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Η έκδοση μου" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4309,5 +4331,5 @@ msgstr "Συγχωνευμένη έκδοση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4315,18 +4337,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Η έκδοση τους" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> κορυφή" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" @@ -4334,13 +4356,13 @@ "κόμβων" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4348,5 +4370,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4354,14 +4376,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4369,5 +4391,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4375,55 +4397,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα πάνω κατά μία θέση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Κάτω" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα κάτω κατά μία θέση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Αφαίρεση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" "Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Πάγωμα" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Πάγωμα της τρέχουσας λίστας συγχωνευμένων στοιχείων" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Ξεπάγωμα" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Ξεπάγωμα της λίστας συγχωνευμένων στοιχείων και έναρξη συγχώνευσης" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4432,5 +4454,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4439,5 +4461,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4446,5 +4468,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4453,5 +4475,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4460,6 +4482,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4468,6 +4490,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4478,5 +4500,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4488,5 +4510,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4495,19 +4517,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Η επικοινωνία με τον διακομιστή απέτυχε" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Όχι, ακύρωση της λειτουργίας" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4516,9 +4538,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4528,5 +4550,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4550,84 +4572,84 @@ msgstr "Συντεταγμένες:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(κανένα)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "διαγράφηκε" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "μη διεγραμένο" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "ορατό (στον διακομιστή)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "μη ορατό (στον διακομιστή)" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Διατήρηση των συντεταγμένων μου" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Διατήρηση των συντεταγμένων τους" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Όχι, ακύρωση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4637,17 +4659,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4656,9 +4678,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4673,19 +4695,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<ακαθόριστο>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4701,10 +4723,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4714,10 +4736,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4744,27 +4766,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4789,22 +4811,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4812,5 +4834,5 @@ msgstr "καμοία" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4901,6 +4923,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4911,5 +4933,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4923,21 +4945,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4945,5 +4967,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5030,10 +5052,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5053,13 +5075,13 @@ msgstr "Σωρός Εντολών: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Επίλυση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5067,5 +5089,5 @@ "λίστα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5074,25 +5096,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Εφαρμογή επίλυσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Συνέχιση επίλυσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5104,13 +5126,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Επίλυση συγκρούσεων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5122,8 +5144,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5190,5 +5212,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5220,34 +5242,34 @@ msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Διαγραφή του επιλεγμένου επιπέδου." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Εμφάνιση/Απόκρυψη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω." @@ -5257,18 +5279,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Αυτό θα αλλάξει εώς {0} αντικείμενο." -msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Κενή τιμή διαγράφει το κλειδί." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5277,10 +5298,10 @@ msgstr "<διαφορετικά>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Αλλαγή τιμών;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5289,5 +5310,5 @@ msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5296,9 +5317,9 @@ msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Παρακαλώ επιλέξτε κλειδί" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Παρακαλώ επιλέξτε μια τιμή" @@ -5323,102 +5344,98 @@ msgstr "Μέλος του" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Προσθήκη Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Ιδιότητες / Υπαγωγές" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Αλλαγή σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Διαγραφή από σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Διαγραφή Ιδιοτήτων" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Επεξεργασία Ιδιοτήτων" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Ιδιότητες / Υπαγωγές" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Αλλαγή σχέσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Διαγραφή από σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Διαγραφή Ιδιοτήτων" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Άνοιγμα λίστας όλων τον σχέσεων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Σχέσεις: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Διαγραφή της επιλεγμένης σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Σημιουργία νέας σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5447,5 +5464,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5457,9 +5474,9 @@ msgstr "Επιλογή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5468,5 +5485,5 @@ "αριστερή εργαλειοθήκη." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5548,12 +5565,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5571,5 +5588,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5577,5 +5594,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5583,18 +5600,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5603,14 +5620,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5620,9 +5637,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5632,15 +5649,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5648,5 +5665,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5654,20 +5671,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5676,66 +5693,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5744,9 +5761,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5755,41 +5772,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5799,19 +5816,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Λήψη πρόσθετου {0}..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5832,10 +5856,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5849,5 +5869,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5917,9 +5937,9 @@ msgstr "Σελιδοδείκτες" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5928,52 +5948,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "ελαχ. γ. πλάτος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "ελαχ. γ. μήκος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "μεγ. γ. πλάτος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "μεγ. γ. μήκος" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5983,52 +6003,52 @@ "για να κατεβάσετε μια περιοχή)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Πηγές και Τύποι δεδομένων" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Δεδομένα OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Ακατέργαστα δεδομένα GPS" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Λήψη σαν νέο επίπεδο" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6036,18 +6056,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Λήψη Περιοχής" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Λήψη" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -6055,22 +6075,22 @@ "διακομιστή" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" "Η περιοχή λήψης είναι εντάξει, μέγεθος πιθανότατα αποδεκτό από διακομιστή" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6092,21 +6112,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6845,8 +6865,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7019,5 +7039,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7029,5 +7049,5 @@ msgstr "Τύπος" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7074,5 +7094,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7086,5 +7106,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7095,5 +7115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7102,19 +7122,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7124,32 +7144,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7171,5 +7191,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7261,33 +7281,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Κόμβος {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Ζούμ στο πρόβλημα" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Φόρτωση ιστορικού" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7296,7 +7314,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Ταξινόμηση μενού προεπιλογών" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7314,7 +7331,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7354,7 +7370,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonymous" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7382,17 +7397,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Έκδοση {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "διαγράφηκε" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7445,10 +7459,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7662,5 +7676,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7683,17 +7697,17 @@ msgstr "Επίπεδο" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7709,7 +7723,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7752,29 +7766,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Αποστολή Αλλαγών" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7782,38 +7796,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7821,16 +7835,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7874,24 +7888,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Εικόνες για {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Ανάγνωση GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7899,33 +7913,33 @@ msgstr "Ανάγνωση {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Αρχή GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Τέλος GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "διαφορά στη ζώνη ώρας: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7934,14 +7948,14 @@ msgstr[1] "εικόνες" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} μέσα στο ίχνος" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Συγχρονισμός ρολογιού" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7949,32 +7963,32 @@ msgstr "Εικόνες JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Εικόνα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." @@ -8064,5 +8078,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8114,10 +8128,10 @@ msgstr[1] "{0} σημεία αναφοράς" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Μετατροπή σε επίπεδο δεδομένων" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8127,11 +8141,11 @@ "βλαβερή.
Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8141,29 +8155,29 @@ msgstr "Μετατράπηκε από: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Λήψη όλων εντός:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} μέτρα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Μέγιστη περιοχή ανά αίτημα:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} τετρ. χλμ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8174,10 +8188,10 @@ "συνεχίσετε;" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" "Δεν υπάρχει διαθέσιμο ίχνος GPX στο επίπεδο για την συσχέτιση με τον ήχο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8185,5 +8199,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8191,23 +8205,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Επίπεδο Δεδομένων {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "εκτός περιοχής λήψης" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "έκδοση {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8216,5 +8230,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8228,5 +8242,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8239,11 +8253,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8252,22 +8266,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Έκδοση API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Μετατροπή σε επίπεδο GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Οδός \"από\" δεν βρέθηκε." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8364,9 +8391,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8432,5 +8459,5 @@ "χρησιμοποιηθεί ακόμα)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8438,5 +8465,5 @@ msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8444,5 +8471,5 @@ msgstr "Νέα τιμή για {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8451,5 +8478,5 @@ msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής" @@ -8574,40 +8601,40 @@ msgstr "Βαθμονόμηση καταγραφέα ήχου" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Χρώμα" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Επίπεδο: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Επιλέξτε" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Επιλέξτε ένα χρώμα για {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Χρώματα που χρησιμοποιούνται από διάφορα αντικείμενα στο JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Χρώματα" @@ -9043,17 +9070,17 @@ msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Εμφάνιση συντεταγένων ως" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Μέθοδος προβολής" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9063,5 +9090,5 @@ msgstr "Προβολή Χάρτη" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9119,81 +9146,81 @@ msgstr "Συντόμευση" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9202,6 +9229,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9370,10 +9397,10 @@ msgstr "Ομάδες τροποποιητών" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "<πολλαπλές>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9383,13 +9410,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9397,18 +9424,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Άγνωστος τύπος: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9419,15 +9446,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Σφάλμα ανάλυσης {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Υποστηρίζονται στοιχεία τύπου {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9437,18 +9464,18 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Τίποτα επιλεγμένο!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Εφαρμογή Προεπιλογής" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Αλλαγή ιδιοτήτων" @@ -9464,6 +9491,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9472,8 +9499,21 @@ msgstr "Επικοινωνία με τον διακομιστή OSM" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Μεταφόρτωση σημείων {0} ως {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9590,11 +9630,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9604,40 +9644,40 @@ msgstr "Μεταφόρτωση δεδομένων OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9700,5 +9740,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9711,66 +9751,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Με επιτυχία άνοιξε το changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Κλείσιμο πακέτου αλλαγών" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Προετοιμασία..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Αποστολή..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9805,5 +9845,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9830,5 +9870,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9836,5 +9876,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9847,5 +9887,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9998,5 +10038,5 @@ msgstr "Το αρχείο \"{0}\" δεν υπάρχει" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10005,38 +10045,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10044,19 +10084,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Άγνωστο αντικείμενο με id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10066,10 +10106,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10079,25 +10117,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10566,5 +10604,5 @@ msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10573,12 +10611,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10588,5 +10619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10596,10 +10627,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10608,5 +10634,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10615,5 +10641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10622,9 +10648,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10634,5 +10667,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10641,5 +10674,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10648,5 +10681,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10655,10 +10688,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10667,10 +10700,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10681,5 +10714,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10689,5 +10722,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11408,5 +11441,5 @@ msgstr "Σφάλμα στο αρχείο {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11419,28 +11452,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Σφάλμα φόρτωσης αρχείου" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11470,13 +11520,13 @@ msgstr "Επιλέξτε από..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11485,13 +11535,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11775,43 +11825,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Ζώνη" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Ζώνη Lambert" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Αλλαγή θέσης" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Ρύθμιση νέας θέσης για την επόμενη αίτηση" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Προσθήκη νέου επιπέδου" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Θέση" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11819,5 +11874,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Προσθήκη νέου επιπέδου" @@ -11848,5 +11903,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Ρύθμιση WMS" @@ -11876,5 +11931,5 @@ "Επιλέξτε ένα από αυτά πρώτα και μετά ξαναπροσπαθήστε" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11882,28 +11937,28 @@ msgstr "Άδειο επίπεδο" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Δεν είναι διανυσματικό." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Είναι διανυσματικό." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11912,24 +11967,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12971,20 +13017,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Θέλετε να το επιτρέψετε;" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13106,13 +13152,9 @@ msgstr "Μείωση ζουμ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13684,6 +13726,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "ακτογραμμή" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14326,12 +14369,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Λήψη" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Λήψη δεδομένων χάρτη από τον διακομιστή του OSM" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14369,7 +14410,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Αφαίρεση διπλών κόμβων..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14435,29 +14475,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Ρύθμιση της θέσης του επιλεγμένου επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14466,5 +14506,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14472,10 +14512,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14488,24 +14528,24 @@ msgstr "Αυτόματη λήψη" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14516,13 +14556,13 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14530,44 +14570,49 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Λήψη εμφανών πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Αλλαγή ανάλυσης" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Ανανέωση λανθασμένων πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Κανάλι άλφα" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Αποθήκευση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Φόρτωση επιπέδου WMS από αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Φόρτωση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Σφάλμα μορφής αρχείου" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Σελιδοδείκτες" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26884,8 +26929,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "ασυνήθηστος συνδυασμός ετικετών" @@ -26905,34 +26949,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "Χάρτες NPE" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "Χάρτες NPE (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -26942,9 +26975,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Streets NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26958,25 +26994,86 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "No earliest version found. History is empty." -#~ msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό." - -#~ msgid "help" -#~ msgstr "βοήθεια" - -#~ msgid "Help / About" -#~ msgstr "Βοήθεια / Σχετικά" - -#~ msgid "WMS Plugin Help" -#~ msgstr "Βοήθεια πρόσθετου WMS" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "Χάρτες NPE" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "Χάρτες NPE (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "ΣΗΜΑΝΤΙΚΟ : τα δεδομένα βρίσκοντε πολύ μακριά από\n" +#~ "τα τρέχοντα όρια της ζώνης Lambert.\n" +#~ "Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα.\n" +#~ "Αναιρέστε την τελυταία σας ενέργεια. Αποθηκεύστε την εργασία σας\n" +#~ "και ξεκινήστε νέο επίπεδο στην νέα ζώνη." + +#~ msgid "Edit Properties" +#~ msgstr "Επεξεργασία Ιδιοτήτων" #~ msgid "" @@ -27168,4 +27265,10 @@ #~ msgstr "Αίτηση Ενημέρωσης" +#~ msgid "WMS Plugin Help" +#~ msgstr "Βοήθεια πρόσθετου WMS" + +#~ msgid "help" +#~ msgstr "βοήθεια" + #~ msgid "Navigation" #~ msgstr "Πλοήγηση" @@ -27405,4 +27508,7 @@ #~ msgstr "Επεξεργασία Γραφείου Πληροφοριών" +#~ msgid "Help / About" +#~ msgstr "Βοήθεια / Σχετικά" + #~ msgid "Please select at least one task to download" #~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη" @@ -27475,2 +27581,5 @@ #~ msgid "Unexpected return value. Got {0}." #~ msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό." Index: applications/editors/josm/i18n/po/en_GB.po =================================================================== --- applications/editors/josm/i18n/po/en_GB.po (revision 18772) +++ applications/editors/josm/i18n/po/en_GB.po (revision 18773) @@ -10,7 +10,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-14 15:40+0000\n" -"Last-Translator: Michael Keppler \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-20 08:08+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:04+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,20 +29,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -63,21 +63,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -85,6 +83,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -96,12 +94,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Warning" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoring malformed file URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Could not read file ''{0}''.
Error is:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -109,17 +116,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Could not read file ''{0}''.
Error is:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -127,8 +125,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -138,21 +136,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -176,8 +174,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -190,6 +191,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Error" @@ -210,6 +211,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -310,5 +311,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -317,27 +318,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -355,5 +356,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Cancel" @@ -363,19 +364,19 @@ msgstr "Please select at least one already uploaded node, way, or relation." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Please select the target layer." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Select target layer" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Merge" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -386,5 +387,5 @@ "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "No target layers" @@ -497,13 +498,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -601,20 +602,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "There are no open changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "No open changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -654,10 +655,10 @@ "nodes)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combine {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Please select at least two ways to combine." @@ -703,10 +704,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -725,11 +726,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Overwrite" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "File exists. Overwrite?" @@ -776,5 +777,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -783,6 +784,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -798,7 +799,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -826,5 +826,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplicate" @@ -848,30 +848,30 @@ msgstr "Exit the application." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "All Formats" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Export to GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Export the data to GPX file." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nothing to export. Get some data first." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -879,13 +879,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -904,8 +904,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -913,7 +913,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -936,9 +936,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -950,5 +950,5 @@ msgstr "parameter ''{0}'' must not be null" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -956,5 +956,5 @@ msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Export GPX file" @@ -1100,6 +1100,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "New" @@ -1231,5 +1231,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Paste" @@ -1317,11 +1317,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Save" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Save the current data." @@ -1378,10 +1378,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Save As..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Save the current data to a new file." @@ -1400,30 +1400,30 @@ "objects too." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Show Status Report" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" "Show status report with useful information that can be attached to bugs" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Help: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Status Report" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Copy to clipboard and close" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1591,5 +1591,5 @@ msgstr "Unglued Node" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1597,5 +1597,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1642,23 +1642,22 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Download data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "No current dataset found" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Update selections" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1666,32 +1665,30 @@ "Updates the currently selected objects from the server (re-downloads data)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Update Selection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "There are no selected primitives to update." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Selection empty" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Update selections" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Upload data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1702,5 +1699,5 @@ "resolve them first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1708,29 +1705,29 @@ msgstr "No changes to upload." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Nothing to upload. Get some data first." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synchronize entire dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1751,11 +1748,11 @@ "{6} to abort and continue editing.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Conflicts detected" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1770,5 +1767,5 @@ "{1} to abort and continue editing.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1781,22 +1778,22 @@ "again with a new or an existing open changeset." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Changeset closed" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1807,19 +1804,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Updating primitive" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1828,5 +1825,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1835,15 +1832,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1955,17 +1952,17 @@ msgstr "Slower Forwards" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Downloading GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Downloaded GPX Data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Downloading data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1974,5 +1971,5 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "No data found in this area." @@ -2031,9 +2028,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Errors during Download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2051,5 +2048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2057,5 +2054,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2152,7 +2149,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2161,9 +2157,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Drag a way segment to make a rectangle." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2177,5 +2172,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2195,17 +2190,17 @@ msgstr[1] "Add and move a virtual new node to {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Move elements" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Move them" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Undo move" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2218,13 +2213,13 @@ "Really move them?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Always move and don't show dialogue again" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Release the mouse button to select the objects in the rectangle." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2232,9 +2227,9 @@ "Release the mouse button to stop moving. Ctrl to merge with nearest node." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Release the mouse button to stop rotating." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2244,15 +2239,15 @@ "Ctrl to rotate selected; or change selection" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zoom and move map" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2262,10 +2257,10 @@ "move zoom with right button" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Search..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2274,58 +2269,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Please enter a filter string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Please enter a search string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regular expression" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "replace selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "add to selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "remove from selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "find in selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "case sensitive" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regular expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' and 'Street' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' anywhere in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - key 'type' with value exactly 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2335,35 +2329,35 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - not 'Bak' in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot set to any value." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Special targets:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - type of the object (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - type of the object (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - all objects changed by user" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - object with given ID (0 for new objects)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - object with given number of nodes" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2371,45 +2365,45 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - all changed objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - all selected objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - all incomplete objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - all untagged objects" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expr - all children of objects matching the expression" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent expr - all parents of objects matching the expression" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent expr - all parents of objects matching the expression" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "Use | or OR to combine with logical or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Use \" to quote operators (e.g. if key contains :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Use ( and ) to group expressions" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2419,51 +2413,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Submit filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Start Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "No match found for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nothing added to selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nothing removed from selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nothing found in selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Found {0} matches" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2480,40 +2474,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "Key cannot be empty when tag operator is used. Sample use: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Unexpected token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Missing arguments for or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Missing argument for not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Expected closing bracket." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2522,9 +2516,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Wrong number of parameters for nodes operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2535,5 +2529,5 @@ "nodes or range, for example nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2640,7 +2634,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2752,5 +2746,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Double conflict" @@ -2778,5 +2772,5 @@ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2784,6 +2778,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "cannot resolve undecided conflict" @@ -2853,18 +2847,8 @@ msgstr "Delete confirmation" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Resolve conflicts in deleted state in {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2899,10 +2883,10 @@ msgstr "Removing reference from relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolve conflicts in member list of relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2936,20 +2920,20 @@ msgstr "Sequence" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Resolve {0} tag conflicts in node {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Resolve {0} tag conflicts in way {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Resolve {0} tag conflicts in relation {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2971,10 +2955,10 @@ msgstr "Resolve version conflicts for relation {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Resolve conflicts in node list of way {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3018,5 +3002,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "New value" @@ -3063,7 +3047,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3072,10 +3056,10 @@ msgstr "Warning: failed to persist preferences to ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Malformed config file at lines {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3086,5 +3070,5 @@ "isn't a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3095,5 +3079,5 @@ "isn't a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3104,5 +3088,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3113,5 +3097,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3120,5 +3104,5 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3129,5 +3113,5 @@ "file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3138,5 +3122,5 @@ "to default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3147,5 +3131,5 @@ "
and creating a new default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3156,10 +3140,10 @@ "default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3242,25 +3226,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3268,5 +3252,5 @@ msgstr "Changeset {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3274,5 +3258,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3282,26 +3266,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Missing argument for not." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "History for relation {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3310,6 +3294,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3317,7 +3301,4 @@ "Keeping target object. " msgstr "" -"My primitive with id {0} and version {1} is visible although their primitive " -"with lower version {2} is not visible. Can't deal with this inconsistency. " -"Keeping my primitive. " #. translators notes must be in front @@ -3374,24 +3355,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "expected id >= 0. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "a primitive with id=0 can't be invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID > 0 expected. Got {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "version > 0 expected. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3399,5 +3380,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3427,10 +3408,10 @@ "multiple values" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3441,7 +3422,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3460,7 +3441,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3595,10 +3576,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3610,6 +3591,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3619,5 +3600,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3627,6 +3608,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3644,6 +3625,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "background" @@ -3661,24 +3642,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambert zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3692,27 +3685,56 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Swiss Grid (Switzerland)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3727,10 +3749,10 @@ msgstr "Could not write bookmark.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Do not show again" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3738,32 +3760,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "incomplete" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "highway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "railway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "waterway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "landuse" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3772,5 +3794,5 @@ msgstr[1] "{0} nodes" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3808,6 +3830,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflict" @@ -3817,11 +3839,11 @@ msgstr "Unknown host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Object deleted" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4028,11 +4050,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4147,5 +4169,5 @@ msgstr "The length of the new way segment being drawn." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4155,18 +4177,18 @@ "this list with the mouse.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(no object)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "User:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "layer not in list." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4288,50 +4310,50 @@ msgstr "role {0} is not participating in compare pair {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Properties" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Nodes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Members" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "No pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags({0} conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Nodes(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4339,17 +4361,17 @@ "Merged node list frozen. No pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Nodes(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Members(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4359,68 +4381,68 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Members(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Pending conflicts in the member list of this relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "No pending property conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Properties(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Pending property conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Conflict Resolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "parameter current out of range: got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "list in role {0} is currently not participating in a compare pair" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "unexpected value of parameter \"index\". Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "item {0} not found in list" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "lock scrolling" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Compare " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "My version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "List of elements in my dataset, i.e. the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4428,5 +4450,5 @@ msgstr "Merged version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4436,30 +4458,30 @@ "decisions are applied." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Their version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "List of elements in their dataset, i.e. the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> top" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Copy my selected nodes to the start of the merged node list" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> bottom" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "Copy my selected elements to the end of the list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4469,5 +4491,5 @@ "merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4477,5 +4499,5 @@ "merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4483,9 +4505,9 @@ "Copy their selected element to the start of the list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "Copy their selected elements to the end of the list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4495,5 +4517,5 @@ "of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4503,54 +4525,54 @@ "merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Up" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Move up the selected elements by one position" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Down" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Move down the selected entries by one position" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Remove" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Remove the selected entries from the list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Freeze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Freeze the current list of merged elements" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Unfreeze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Unfreeze the list of merged elements and start merging" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4560,5 +4582,5 @@ "Click {0} to start merging my and their entries" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4569,5 +4591,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4576,5 +4598,5 @@ msgstr[1] "My version ({0} entries)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4583,5 +4605,5 @@ msgstr[1] "Merged version ({0} entries)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4590,6 +4612,6 @@ msgstr[1] "Their version ({0} entries)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4600,6 +4622,6 @@ "adjustment." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4610,5 +4632,5 @@ msgstr "Node" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "Merged nodes not frozen yet. Can't build resolution command" @@ -4620,5 +4642,5 @@ msgstr "unexpected column index. Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4629,19 +4651,19 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Communication with server failed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Yes, undelete them too" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "No, cancel operation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4652,9 +4674,9 @@ "the server.

Do you want to undelete these nodes too?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Undelete additional nodes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4667,5 +4689,5 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Undelete dependent primitives?" @@ -4691,84 +4713,84 @@ msgstr "Coordinates:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Deleted State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Visible State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(none)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "not deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "visible (on the server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "not visible (on the server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Keep a clone of the local version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Physically delete from local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Keep my coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Keep their coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Undecide conflict between different coordinates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Keep my deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Keep their deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Undecide conflict between deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Keep my visible state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Yes, reset the id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "No, abort" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4781,17 +4803,17 @@ "yo agree?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Reset id to 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Keep their visible state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Yes, purge it" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4802,9 +4824,9 @@ "dataset.
Do you agree?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Remove from dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Undecide conflict between visible state" @@ -4819,19 +4841,19 @@ msgstr "merged nodes not frozen yet. Can't build resolution command" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4847,10 +4869,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4860,10 +4882,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4890,27 +4912,27 @@ msgstr "Their version (server dataset)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Keep the selected key/value pairs from the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Keep the selected key/value pairs from the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Undecide" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Mark the selected tags as undecided" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4935,22 +4957,22 @@ msgstr "No conflicts to resolve" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Cancel conflict resolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Apply resolved conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Apply" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4958,5 +4980,5 @@ msgstr "none" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5047,6 +5069,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5057,5 +5079,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5069,21 +5091,21 @@ msgstr "pos {0} is out of range. current number of members: {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "Remove this relation member from the relation" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "Undecided" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "Not decided yet" @@ -5091,5 +5113,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Role:" @@ -5176,10 +5198,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5199,17 +5221,17 @@ msgstr "Command Stack: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Resolve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "Open a merge dialogue of all selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5219,25 +5241,25 @@ "Set the selected elements on the map to the selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancel conflict resolution and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Apply resolved conflicts and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Apply Resolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Close anyway" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Continue resolving" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5254,13 +5276,13 @@ "{1} to return to resolving conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Conflict not resolved completely" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Resolve conflicts" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5272,8 +5294,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5340,5 +5362,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5370,34 +5392,34 @@ msgstr "Open a list of all loaded layers." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Delete the selected layer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Show/Hide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Toggle visible state of the selected layer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Activate" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Activate the selected layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Merge this layer into another layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Move the selected layer one row up." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Move the selected layer one row down." @@ -5407,18 +5429,17 @@ msgstr "Information about layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "This will change up to {0} object." -msgstr[1] "This will change up to {0} objects." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "An empty value deletes the key." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5427,10 +5448,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Change values?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5439,5 +5460,5 @@ msgstr[1] "Change properties of up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5446,9 +5467,9 @@ msgstr[1] "This will change up to {0} objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Please select a key" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Please select a value" @@ -5472,102 +5493,98 @@ msgstr "Member Of" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Add Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Properties: {0} / Memberships: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Properties / Memberships" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Change relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Delete from relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Really delete selection from relation {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Delete the selected key in all objects" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Delete Properties" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Add a new key/value pair to all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Edit Properties" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Edit the value of the selected key for all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Properties: {0} / Memberships: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Properties / Memberships" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Change relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Delete from relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Really delete selection from relation {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Delete the selected key in all objects" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Delete Properties" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Open a list of all relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relations: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Open an editor for the selected relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Delete the selected relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Create a new relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "Create a copy of this relation and open it in another editor window" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "Set the current selection to the list of selected relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5596,5 +5613,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5606,9 +5623,9 @@ msgstr "Selection: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Undock the panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5616,5 +5633,5 @@ "Close this panel. You can reopen it with the buttons in the left toolbar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Click to minimise/maximise the panel content" @@ -5634,5 +5651,5 @@ msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "{0} Autore" +msgstr[0] "{0} Author" msgstr[1] "{0} Autori" @@ -5698,12 +5715,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Download relation members" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Conflicts in data" @@ -5723,5 +5740,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5729,5 +5746,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5735,18 +5752,18 @@ msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Tags and Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Parent Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Child Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5758,14 +5775,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Remove them, clean up relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Ignore them, leave relation as is" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5778,9 +5795,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5793,5 +5810,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5799,5 +5816,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5805,5 +5822,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5813,5 +5830,5 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5821,15 +5838,15 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove all members referring to one of the selected primitives" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Relation Editor: Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" @@ -5837,5 +5854,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5846,66 +5863,66 @@ "selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "Select primitives for selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Sort the relation members" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Relation Editor: Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Relation Editor: Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Remove the currently selected members from this relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Relation Editor: Remove" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5917,9 +5934,9 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Conflict in data" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5930,41 +5947,41 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Download all incomplete ways and nodes in relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Sets a role for the selected members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5977,19 +5994,26 @@ "new role?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "No, don't apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "Edit the relation the currently selected relation member refers to" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Downloading relation {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5999,7 +6023,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "Zoom to primitive the first selected member refers to" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -6011,11 +6034,7 @@ msgstr "Zooming disabled because there is no selected member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Refers to" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Linked" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6028,5 +6047,5 @@ msgstr "Value of child.getId() > 0 expected. Got {1}." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6097,9 +6116,9 @@ msgstr "Bookmarks" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6108,52 +6127,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "Name of location" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6163,52 +6182,52 @@ "area)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Bounding Box" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Data Sources and Types" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Raw GPS data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Download as new layer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6216,38 +6235,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Download Area" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Download" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Download area too large, will probably be rejected by server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Download area ok, size probably acceptable to server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6269,21 +6288,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer exception, possibly some missing tags." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -7022,8 +7041,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7196,5 +7215,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7206,5 +7225,5 @@ msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7254,5 +7273,5 @@ msgstr "JOSM Help Browser" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7266,5 +7285,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7275,5 +7294,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7282,19 +7301,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "Open the current help page in an external browser" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "Edit the current help page" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7304,32 +7323,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "Reload the current help page" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7351,5 +7370,5 @@ msgstr "Longitude: " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "Coordinates" @@ -7413,12 +7432,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7443,33 +7462,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Node {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zoom to problem" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Load history" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Way {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7478,7 +7495,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Sort presets menu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7496,7 +7512,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7524,21 +7539,19 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 +#, java-format +msgid "" "Version {0} created on {1}" - -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 -#, java-format -msgid "" +msgstr "" "Version {0} created on {1}" -msgstr "" -"Version {0} created on {1}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonymous" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7566,17 +7579,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Version {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "deleted" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Version {0} created on {1} by {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7629,10 +7641,10 @@ msgstr "Closing changeset {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "Launch a file chooser to select a file" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Select filename" @@ -7863,5 +7875,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7884,17 +7896,17 @@ msgstr "Layer" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Should upload?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Should save?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Filename" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7910,7 +7922,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Tags of new changeset" @@ -7953,29 +7965,29 @@ msgstr[1] "{0} objects to delete:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Upload Changes" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Upload the changed primitives" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "Please enter a comment for this upload changeset (min. 3 characters)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "Illegal upload comment" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Cancel the upload and resume editing" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Upload all changes in one request" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7985,38 +7997,38 @@ "changed primitive" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Provide a brief comment for the changes you are uploading:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Open a new changeset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "Open a new changeset and use it in the next upload" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Use an open changeset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Upload data to an already opened changeset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Close changeset after upload" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "Select to close the changeset after the next upload" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -8024,16 +8036,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Load the list of your open changesets from the server" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Close the currently selected open changeset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8083,24 +8095,24 @@ msgstr "Continue uploading" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Images for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Read GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "No time for point {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Cannot read time \"{0}\" from point {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8108,33 +8120,33 @@ msgstr "Reading {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "No images with readable timestamps found." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geotagged Images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS end: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "current delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "timezone difference: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8143,14 +8155,14 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} within the track." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Sync clock" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8158,32 +8170,32 @@ msgstr "JPEG images (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "The date in file \"{0}\" could not be parsed." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "There is no EXIF time within the file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Image" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPS unit timezone (difference to photo)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synchronise Time with GPS Unit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Time entered could not be parsed." @@ -8273,5 +8285,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8323,10 +8335,10 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Convert to data layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8336,11 +8348,11 @@ "
If you want to upload traces, look here:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8350,29 +8362,29 @@ msgstr "Converted from: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Download from OSM along this track" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Download everything within:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Maximum area per request:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} sq km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8383,9 +8395,9 @@ "wish
to continue?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "No GPX track available in layer to associate audio with." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8395,5 +8407,5 @@ "the end were omitted or moved to the start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8403,23 +8415,23 @@ "time were omitted." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8428,5 +8440,5 @@ msgstr[1] "There were {0} conflicts detected." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8440,5 +8452,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8451,11 +8463,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8464,22 +8476,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "No \"from\" way found." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8579,9 +8604,9 @@ msgstr "No existing audio markers in this layer to offset from." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Show/Hide Text/Icons" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Toggle visible state of the marker text and icons." @@ -8647,5 +8672,5 @@ msgstr "Default value currently unknown (setting has not been used yet)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8653,5 +8678,5 @@ msgstr "Please select the row to edit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8659,5 +8684,5 @@ msgstr "New value for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8666,5 +8691,5 @@ msgstr "Please select the row to delete." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Enter a new key/value pair" @@ -8801,40 +8826,40 @@ msgstr "Voice recorder calibration" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Colour" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Paint style {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Layer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Choose" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Choose a colour for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Set to default" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Set all to default" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Colours used by different objects in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Colours" @@ -9278,17 +9303,17 @@ msgstr "You have to restart JOSM for some settings to take effect." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Display coordinates as" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projection method" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9298,5 +9323,5 @@ msgstr "Map Projection" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9354,81 +9379,81 @@ msgstr "Shortcut" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Icon paths" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Short Description: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Author: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Webpage: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9437,6 +9462,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9627,10 +9652,10 @@ msgstr "Modifier Groups" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9640,13 +9665,13 @@ msgstr[1] "Remove old keys from up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Add a new tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Delete the selection in the tag table" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9654,18 +9679,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Optional Attributes:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "closed way" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Unknown type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9676,15 +9701,15 @@ msgstr "Could not read tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Error parsing {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elements of type {0} are supported." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9694,18 +9719,18 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Change Properties" @@ -9721,6 +9746,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9729,8 +9754,21 @@ msgstr "Contacting OSM Server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Downloading points {0} to {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "unexpected format of id replied by the server, got ''{0}''" #. SAXException does not chain correctly @@ -9847,11 +9885,11 @@ msgstr "Unknown mode {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "no primitive with id {0} in local dataset. Can't infer primitive type" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9861,40 +9899,40 @@ msgstr "Downloading OSM data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Fetching node with id {0} from ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Fetching way with id {0} from ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Fetching relation with id {0} from ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Server replied with response code 404 for id {0}. Skipping." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Fetching a package of nodes from ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Fetching a package of ways from ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Fetching a package of relations from ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9961,5 +9999,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9973,66 +10011,66 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Creating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Successfully opened changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Updating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Updating changeset {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Uploading..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - trying again." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starting retry {0} of {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10067,5 +10105,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10092,5 +10130,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10098,5 +10136,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10109,5 +10147,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10269,5 +10307,5 @@ msgstr "File \"{0}\" does not exist" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10276,38 +10314,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10315,19 +10353,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Incomplete specification with ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Illegal object with id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10337,10 +10375,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10350,25 +10386,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10832,5 +10868,5 @@ msgstr "(The text has already been copied to your clipboard.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10839,12 +10875,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10854,5 +10883,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10865,10 +10894,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10877,5 +10901,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10884,5 +10908,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10891,9 +10915,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10906,5 +10937,5 @@ "applet and because you didn''t load your applet from ''{1}''." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10915,5 +10946,5 @@ "check your internet connection." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10922,5 +10953,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10929,10 +10960,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10941,10 +10972,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10955,5 +10986,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10966,5 +10997,5 @@ "preferences and your internet connection." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11703,5 +11734,5 @@ msgstr "Error on file {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11714,29 +11745,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Error loading file" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambert Zone 1 cache file (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert Zone 1 cache file (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambert Zone 2 cache file (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambert Zone 3 cache file (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert Zone 4 cache file (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11765,13 +11816,13 @@ msgstr "Choose from..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11783,13 +11834,13 @@ "Would you like to restore F11 for grab action ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "Restore grab shortcut F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM is stopped for the change to take effect." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12082,43 +12133,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambert zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Load location from cache (only if cache is enabled)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Change location" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Set a new location for the next request" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Add a new layer" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Location" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12128,5 +12184,5 @@ "known by www.cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Add new layer" @@ -12157,5 +12213,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Adjust WMS" @@ -12185,5 +12241,5 @@ "Select one of them first, then retry" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12191,28 +12247,28 @@ msgstr "Blank Layer" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS layer ({0}), {1} tile(s) loaded" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Is not vectorised." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Is vectorised." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Commune bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12223,25 +12279,16 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Cache Format Error" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Cache Lambert Zone Error" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13293,20 +13340,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Do you want to allow this?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Confirm Remote Control action" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Remote Control has been asked to import data from the following URL:" @@ -13428,13 +13475,9 @@ msgstr "Decrease zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Flush Tile Cache" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "image " @@ -14016,6 +14059,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Unordered coastline" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14666,12 +14710,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Download" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Download map data from the OSM server." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14687,9 +14729,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"There are no layers the source layer
''{0}''
could be merged to." -"" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14711,7 +14751,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Removing duplicate nodes..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14779,29 +14818,29 @@ msgstr "No valid WMS URL or id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Adjust the position of the selected WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Please select the WMS layer to adjust." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Select WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Start adjusting" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "There are currently no WMS layer to adjust." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "No layers to adjust" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14810,5 +14849,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14816,10 +14855,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14834,24 +14873,24 @@ msgstr "Automatic downloading" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS layer ({0}), automatically downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14866,13 +14905,13 @@ "tiles anyway?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14880,44 +14919,49 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "File Format Error" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Bookmarks" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27271,8 +27315,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "unusual tag combination" @@ -27292,34 +27335,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE Maps" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Maps (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27329,9 +27361,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Streets NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27345,53 +27380,977 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Can't search because there is no loaded data." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "There's no primitive with version {0} in this history" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "There's no version valid at date ''{0}'' in this history" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "no earliest version found. History is empty." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "no latest version found. History is empty." - -#~ msgid "No type found. History is empty." -#~ msgstr "No type found. History is empty." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Didn't find an primitive with id {0} in this dataset" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." + +#~ msgid "Edit Properties" +#~ msgstr "Edit Properties" + +#~ msgid "Linked" +#~ msgstr "Linked" + +#~ msgid "Move" +#~ msgstr "Move" + +#~ msgid "Data Layer" +#~ msgstr "Data Layer" + +#~ msgid "No data imported." +#~ msgstr "No data imported." + +#~ msgid "Please enter the desired coordinates first." +#~ msgstr "Please enter the desired coordinates first." + +#~ msgid "Select a bookmark first." +#~ msgstr "Select a bookmark first." + +#~ msgid "File could not be found." +#~ msgstr "File could not be found." + +#~ msgid "No document open so nothing to save." +#~ msgstr "No document open so nothing to save." + +#~ msgid "Unknown file extension." +#~ msgstr "Unknown file extension." + +#~ msgid "Refresh the selection list." +#~ msgstr "Refresh the selection list." + +#~ msgid "Merging conflicts." +#~ msgstr "Merging conflicts." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolve Conflicts" + +#~ msgid "Object" +#~ msgstr "Object" + +#~ msgid "There were conflicts during import." +#~ msgstr "There were conflicts during import." + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Hint: Some changes came from uploading new data to the server." + +#~ msgid "Unsaved Changes" +#~ msgstr "Unsaved Changes" + +#~ msgid "my version:" +#~ msgstr "my version:" + +#~ msgid "their version:" +#~ msgstr "their version:" + +#~ msgid "resolved version:" +#~ msgstr "resolved version:" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contacting the OSM server..." + +#~ msgid "Error while parsing" +#~ msgstr "Error while parsing" + +#~ msgid "Unknown version" +#~ msgstr "Unknown version" + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "different" + +#~ msgid "true" +#~ msgstr "true" + +#~ msgid "false" +#~ msgstr "false" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Resolve {0} conflicts in {1} objects" + +#~ msgid "Change" +#~ msgstr "Change" + +#~ msgid "unnamed" +#~ msgstr "unnamed" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Cannot open preferences directory: {0}" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} object has conflicts:" +#~ msgstr[1] "{0} objects have conflicts:" + +#~ msgid "Can only edit help pages from JOSM Online Help" +#~ msgstr "Can only edit help pages from JOSM Online Help" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Click Reload to refresh list" + +#~ msgid "Date" +#~ msgstr "Date" + +#~ msgid "Revert" +#~ msgstr "Revert" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." + +#~ msgid "Email" +#~ msgstr "E-Mail" + +#~ msgid "Station" +#~ msgstr "Station" + +#~ msgid "Navigation" +#~ msgstr "Navigation" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM username (e-mail)" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." + +#~ msgid "Found element in non-way." +#~ msgstr "Found element in non-way." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." + +#~ msgid " has zero ref" +#~ msgstr " has zero ref" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Plugin requires JOSM update: {0}." + +#~ msgid "Commit comment" +#~ msgstr "Commit comment" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" + +#~ msgid "" +#~ "(You can change the number of days after which this warning appears
by " +#~ "setting the config option 'pluginmanager.warntime'.)" +#~ msgstr "" +#~ "(You can change the number of days after which this warning appears
by " +#~ "setting the config option 'pluginmanager.warntime'.)" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "Use preset ''{0}'' of group ''{1}''" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "Use preset ''{0}''" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (empty value deletes tag)" + +#~ msgid "Occupied By" +#~ msgstr "Occupied By" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Add all currently selected objects as members" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Remove the member in the current table row from this relation" + +#~ msgid "Error parsing server response." +#~ msgstr "Error parsing server response." + +#~ msgid "Cannot connect to server." +#~ msgstr "Cannot connect to server." + +#~ msgid "name" +#~ msgstr "name" + +#~ msgid "Tagging preset sources" +#~ msgstr "Tagging preset sources" + +#~ msgid "Tagging preset source" +#~ msgstr "Tagging preset source" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Add a new tagging preset source to the list." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Add either site-josm.xml or Wiki Pages." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error deleting plugin file: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin already exists" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." +#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Could not download plugin: {0} from {1}" + +#~ msgid "File not found" +#~ msgstr "File not found" + +#~ msgid "Rotate" +#~ msgstr "Rotate" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Delete {1} {0}" + +#~ msgid "Conflicting relation" +#~ msgstr "Conflicting relation" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Error while loading page {0}" +#~ msgstr "Error while loading page {0}" + +#~ msgid "Open in Browser" +#~ msgstr "Open in Browser" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSM Online Help" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Combine ways with different memberships?" + +#~ msgid "All the ways were empty" +#~ msgstr "All the ways were empty" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Some of the nodes are (almost) in the line" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Merge nodes with different memberships?" + +#~ msgid "Only two nodes allowed" +#~ msgstr "Only two nodes allowed" + +#~ msgid "Only one node selected" +#~ msgstr "Only one node selected" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "Please select ways with almost right angles to orthogonalise." + +#~ msgid "Please select at least one task to download" +#~ msgstr "Please select at least one task to download" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Really mark this issue as ''done''?" + +#~ msgid "Please enter a search string" +#~ msgstr "Please enter a search string" + +#~ msgid "Cannot read place search results from server" +#~ msgstr "Cannot read place search results from server" + +#~ msgid "Import TCX File..." +#~ msgstr "Import TCX File..." + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Import TCX file as GPS track" + +#~ msgid "zoom" +#~ msgstr "zoom" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." + +#~ msgid "Validate" +#~ msgstr "Validate" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Validate either current selection or complete dataset." + +#~ msgid "Request Update" +#~ msgstr "Request Update" + +#~ msgid "error loading metadata" +#~ msgstr "error loading metadata" + +#~ msgid "Show Tile Status" +#~ msgstr "Show Tile Status" + +#~ msgid "requested: {0}" +#~ msgstr "requested: {0}" + +#~ msgid "error requesting update" +#~ msgstr "error requesting update" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Please select the row to copy." +#~ msgstr "Please select the row to copy." + +#~ msgid "Copy Default" +#~ msgstr "Copy Default" + +#~ msgid "Help / About" +#~ msgstr "Help / About" + +#~ msgid "WMS Plugin Help" +#~ msgstr "WMS Plugin Help" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Adjust the position of the WMS layer" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "Drawbridge" +#~ msgstr "Drawbridge" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "Edit Station" +#~ msgstr "Edit Station" + +#~ msgid "citymap" +#~ msgstr "citymap" + +#~ msgid "hikingmap" +#~ msgstr "hikingmap" + +#~ msgid "map" +#~ msgstr "map" + +#~ msgid "bicyclemap" +#~ msgstr "bicyclemap" + +#~ msgid "board" +#~ msgstr "board" + +#~ msgid "Charge" +#~ msgstr "Charge" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK+)" + +#~ msgid "Ill-formed node id" +#~ msgstr "Ill-formed node id" + +#~ msgid "Found element in non-relation." +#~ msgstr "Found element in non-relation." + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." + +#~ msgid "" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" +#~ "\n" +#~ "You can also do this manually in the Advanced Preferences, using the " +#~ "following schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Full WMS URL input format example (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n" +#~ "format=image/jpeg \n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " +#~ "only need to input the relevant 'id'.\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id: \n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ " \n" +#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " +#~ "use." +#~ msgstr "" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" +#~ "\n" +#~ "You can also do this manually in the Advanced Preferences, using the " +#~ "following schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Full WMS URL input format example (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?" +#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/" +#~ "jpeg\n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " +#~ "only need to input the relevant 'id'.\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example,replacing 73 with your image id:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?" +#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n" +#~ "format=image/png" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS" + +#~ msgid "Portcullis" +#~ msgstr "Portcullis" + +#~ msgid "Empty member in relation." +#~ msgstr "Empty member in relation." + +#~ msgid "Replaces Selection with Users data" +#~ msgstr "Replaces Selection with Users data" + +#~ msgid "Please choose a user using the author panel" +#~ msgstr "Please choose a user using the author panel" + +#~ msgid "Sorry, doesn't work with anonymous users" +#~ msgstr "Sorry, doesn't work with anonymous users" + +#~ msgid "Open User Page" +#~ msgstr "Open User Page" + +#~ msgid "Please select some data" +#~ msgstr "Please select some data" + +#~ msgid "Open User Page in browser" +#~ msgstr "Open User Page in browser" + +#~ msgid "Select User's Data" +#~ msgstr "Select User's Data" + +#~ msgid "Show Author Panel" +#~ msgstr "Show Author Panel" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." + +#~ msgid "Upload to OSM..." +#~ msgstr "Upload to OSM..." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Authors: {0}" +#~ msgstr "Authors: {0}" + +#~ msgid "Layers: {0}" +#~ msgstr "Layers: {0}" + +#~ msgid "History of Element" +#~ msgstr "History of Element" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Conflicts: {0}" + +#~ msgid "viaduct" +#~ msgstr "viaduct" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "" +#~ "Opens the OpenStreetBugs window and activates the automatic download" + +#~ msgid "Please select one or more closed ways of at least four nodes." +#~ msgstr "Please select one or more closed ways of at least four nodes." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Skipping a way because it includes a node that doesn''t exist: {0}\n" + +#~ msgid "sports" +#~ msgstr "sports" + +#~ msgid "Public" +#~ msgstr "Public" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "Selected makes your trace public in openstreetmap.org" + +#~ msgid "Open a layer first (GPX, OSM, cache)" +#~ msgstr "Open a layer first (GPX, OSM, cache)" + +#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" +#~ msgstr "" +#~ "Set manually the Lambert zone (e.g. for locations between two zones)" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Select Tableau d'Assemblage" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" + +#~ msgid "Remove Selected" +#~ msgstr "Remove Selected" + +#~ msgid "Basic" +#~ msgstr "Basic" + +#~ msgid "Delete Layer" +#~ msgstr "Delete Layer" + +#~ msgid "Delete and Download" +#~ msgstr "Delete and Download" + +#~ msgid "Combine Anyway" +#~ msgstr "Combine Anyway" + +#~ msgid "Merge Anyway" +#~ msgstr "Merge Anyway" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "No intersection found. Nothing was changed." + +#~ msgid "Continue anyway" +#~ msgstr "Continue anyway" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading." + +#~ msgid "Move Down" +#~ msgstr "Move Down" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relation Editor: {0}" + +#~ msgid "Move Up" +#~ msgstr "Move Up" + +#~ msgid "Update Data" +#~ msgstr "Update Data" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." + +#~ msgid "Change the projection to {0} first." +#~ msgstr "Change the projection to {0} first." + +#~ msgid "Invalid projection" +#~ msgstr "Invalid projection" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Edit Drawbridge" + +#~ msgid "Edit Portcullis" +#~ msgstr "Edit Portcullis" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" + +#~ msgid "Board Type" +#~ msgstr "Board Type" + +#~ msgid "Edit Information Office" +#~ msgstr "Edit Information Office" + +#~ msgid "Map Type" +#~ msgstr "Map Type" + +#~ msgid "" +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." +#~ msgstr "" +#~ "Tools to work with authors/users. Selects map data that belongs to " +#~ "selected user, opens browser showing selected author profile page." + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Directly load TCX files from JOSM." + +#~ msgid "" +#~ "The main feature of the plugin is the possibility to delete points of the " +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." +#~ msgstr "" +#~ "The main feature of the plugin is the possibility to delete points of the " +#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " +#~ "eg. deleting uninteresting parts of track." + +#~ msgid "Remove route nodes" +#~ msgstr "Remove route nodes" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Login name (e-mail) to the OSM account." + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "The following errors occurred during mass download:" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "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." + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "An error occurred while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." + +#~ msgid "Error processing changeset upload response" +#~ msgstr "Error processing changeset upload response" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "Version number missing from OSM data" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Data upload failed for unknown reason" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "Cannot read numeric value from response" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Image with path {0} does not exist or is not readable." + +#~ msgid "% of lon:" +#~ msgstr "% of lon:" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}." + +#~ msgid "Resolve conflicts in member list of of relation {0}" +#~ msgstr "Resolve conflicts in member list of relation {0}" + +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "parameter '{0}' must not be null" + +#~ msgid "" +#~ "Properties in the merged element. They will replace properties in my " +#~ "elements when merge decisions are applied." +#~ msgstr "" +#~ "Properties in the merged element. They will replace properties in my " +#~ "elements when merge decisions are applied." + +#~ msgid "WARNING: unexpected value for preference conflict.resolution, got " +#~ msgstr "WARNING: unexpected value for preference conflict.resolution, got " + +#~ msgid "Apply partial resolutions" +#~ msgstr "Apply partial resolutions" + +#~ msgid "Reached the end of the line" +#~ msgstr "Reached the end of the line" + +#~ msgid "Select a starting node on the end of a way" +#~ msgstr "Select a starting node on the end of a way" + +#~ msgid "Reached a junction" +#~ msgstr "Reached a junction" + +#~ msgid "" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigend a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" +#~ msgstr "" +#~ "The OSM primitive with id {0} has been " +#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " +#~ "primitive will be assigned a new id.
Click {2} to " +#~ "accept the state on the server and to delete your primitive.
Click " +#~ "{3} to cancel.
" + +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Checking whether node {0} is gone ..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Undeleting relation..." + +#~ msgid "Undeleting Way..." +#~ msgstr "Undeleting Way..." + +#~ msgid "Missing primitive" +#~ msgstr "Missing primitive" + +#~ msgid "Checking whether primitive {0} is gone ..." +#~ msgstr "Checking whether primitive {0} is gone ..." + +#~ msgid "Update failed" +#~ msgstr "Update failed" + +#~ msgid "" +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" +#~ msgstr "" +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" + +#~ msgid "Selection too big" +#~ msgstr "Selection too big" + +#~ msgid "Updates the currently selected primitives from the server" +#~ msgstr "Updates the currently selected primitives from the server" + +#~ msgid "Conflict detected" +#~ msgstr "Conflict detected" + +#~ msgid "Upload to OSM API failed" +#~ msgstr "Upload to OSM API failed" + +#~ msgid "" +#~ "Uploading failed because a primitive you tried " +#~ "to
delete on the server is already deleted.

The error message " +#~ "is:
{0}" +#~ msgstr "" +#~ "Uploading failed because a primitive you tried " +#~ "to
delete on the server is already deleted.

The error message " +#~ "is:
{0}" + +#~ msgid "Primitive already deleted" +#~ msgstr "Primitive already deleted" + +#~ msgid "nodes" +#~ msgstr "nodes" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Purging 1 primitive" + +#~ msgid "ways" +#~ msgstr "ways" + +#~ msgid "relations" +#~ msgstr "relations" + +#~ msgid "Error when communicating with server." +#~ msgstr "Error when communicating with server." + +#~ msgid "Didn't find an historized primitive with id {0} in this dataset" +#~ msgstr "Didn't find an historized primitive with id {0} in this dataset" #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" #~ msgstr "" #~ "Didn't find an primitive with id {0} and version {1} in this dataset" - -#~ msgid "Select a starting node on the end of a way" -#~ msgstr "Select a starting node on the end of a way" - -#~ msgid "Reached the end of the line" -#~ msgstr "Reached the end of the line" - -#~ msgid "Reached a junction" -#~ msgstr "Reached a junction" - -#~ msgid "help" -#~ msgstr "help" - -#~ msgid "Help / About" -#~ msgstr "Help / About" #~ msgid "" @@ -27442,832 +28401,4 @@ #~ "use." -#~ msgid "WMS Plugin Help" -#~ msgstr "WMS Plugin Help" - -#~ msgid "Move" -#~ msgstr "Move" - -#~ msgid "Data Layer" -#~ msgstr "Data Layer" - -#~ msgid "No data imported." -#~ msgstr "No data imported." - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Please enter the desired coordinates first." - -#~ msgid "Select a bookmark first." -#~ msgstr "Select a bookmark first." - -#~ msgid "File could not be found." -#~ msgstr "File could not be found." - -#~ msgid "No document open so nothing to save." -#~ msgstr "No document open so nothing to save." - -#~ msgid "Unknown file extension." -#~ msgstr "Unknown file extension." - -#~ msgid "Refresh the selection list." -#~ msgstr "Refresh the selection list." - -#~ msgid "Merging conflicts." -#~ msgstr "Merging conflicts." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolve Conflicts" - -#~ msgid "Object" -#~ msgstr "Object" - -#~ msgid "There were conflicts during import." -#~ msgstr "There were conflicts during import." - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Hint: Some changes came from uploading new data to the server." - -#~ msgid "Unsaved Changes" -#~ msgstr "Unsaved Changes" - -#~ msgid "my version:" -#~ msgstr "my version:" - -#~ msgid "their version:" -#~ msgstr "their version:" - -#~ msgid "resolved version:" -#~ msgstr "resolved version:" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Contacting the OSM server..." - -#~ msgid "Error while parsing" -#~ msgstr "Error while parsing" - -#~ msgid "Unknown version" -#~ msgstr "Unknown version" - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "different" - -#~ msgid "true" -#~ msgstr "true" - -#~ msgid "false" -#~ msgstr "false" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Resolve {0} conflicts in {1} objects" - -#~ msgid "Change" -#~ msgstr "Change" - -#~ msgid "unnamed" -#~ msgstr "unnamed" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Cannot open preferences directory: {0}" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} object has conflicts:" -#~ msgstr[1] "{0} objects have conflicts:" - -#~ msgid "Can only edit help pages from JOSM Online Help" -#~ msgstr "Can only edit help pages from JOSM Online Help" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Click Reload to refresh list" - -#~ msgid "Date" -#~ msgstr "Date" - -#~ msgid "Revert" -#~ msgstr "Revert" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." - -#~ msgid "Email" -#~ msgstr "E-Mail" - -#~ msgid "Station" -#~ msgstr "Station" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM username (e-mail)" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." - -#~ msgid "Found element in non-way." -#~ msgstr "Found element in non-way." - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." - -#~ msgid " has zero ref" -#~ msgstr " has zero ref" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Plugin requires JOSM update: {0}." - -#~ msgid "Commit comment" -#~ msgstr "Commit comment" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" - -#~ msgid "" -#~ "(You can change the number of days after which this warning appears
by " -#~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "" -#~ "(You can change the number of days after which this warning appears
by " -#~ "setting the config option 'pluginmanager.warntime'.)" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "Use preset ''{0}'' of group ''{1}''" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "Use preset ''{0}''" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (empty value deletes tag)" - -#~ msgid "Occupied By" -#~ msgstr "Occupied By" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Add all currently selected objects as members" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Remove the member in the current table row from this relation" - -#~ msgid "Error parsing server response." -#~ msgstr "Error parsing server response." - -#~ msgid "Cannot connect to server." -#~ msgstr "Cannot connect to server." - -#~ msgid "name" -#~ msgstr "name" - -#~ msgid "Tagging preset sources" -#~ msgstr "Tagging preset sources" - -#~ msgid "Tagging preset source" -#~ msgstr "Tagging preset source" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Add a new tagging preset source to the list." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Add either site-josm.xml or Wiki Pages." - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin already exists" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." -#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Could not download plugin: {0} from {1}" - -#~ msgid "File not found" -#~ msgstr "File not found" - -#~ msgid "Rotate" -#~ msgstr "Rotate" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Delete {1} {0}" - -#~ msgid "Conflicting relation" -#~ msgstr "Conflicting relation" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Error while loading page {0}" -#~ msgstr "Error while loading page {0}" - -#~ msgid "Open in Browser" -#~ msgstr "Open in Browser" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSM Online Help" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Combine ways with different memberships?" - -#~ msgid "All the ways were empty" -#~ msgstr "All the ways were empty" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Some of the nodes are (almost) in the line" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Merge nodes with different memberships?" - -#~ msgid "Only two nodes allowed" -#~ msgstr "Only two nodes allowed" - -#~ msgid "Only one node selected" -#~ msgstr "Only one node selected" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "Please select ways with almost right angles to orthogonalise." - -#~ msgid "Please select at least one task to download" -#~ msgstr "Please select at least one task to download" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Really mark this issue as ''done''?" - -#~ msgid "Please enter a search string" -#~ msgstr "Please enter a search string" - -#~ msgid "Cannot read place search results from server" -#~ msgstr "Cannot read place search results from server" - -#~ msgid "Import TCX File..." -#~ msgstr "Import TCX File..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Import TCX file as GPS track" - -#~ msgid "zoom" -#~ msgstr "zoom" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." - -#~ msgid "Validate" -#~ msgstr "Validate" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "Validate either current selection or complete dataset." - -#~ msgid "Request Update" -#~ msgstr "Request Update" - -#~ msgid "error loading metadata" -#~ msgstr "error loading metadata" - -#~ msgid "Show Tile Status" -#~ msgstr "Show Tile Status" - -#~ msgid "requested: {0}" -#~ msgstr "requested: {0}" - -#~ msgid "error requesting update" -#~ msgstr "error requesting update" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier image id" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectifier id={0}" - -#~ msgid "Please select the row to copy." -#~ msgstr "Please select the row to copy." - -#~ msgid "Copy Default" -#~ msgstr "Copy Default" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Adjust the position of the WMS layer" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "Drawbridge" -#~ msgstr "Drawbridge" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Edit Station" -#~ msgstr "Edit Station" - -#~ msgid "citymap" -#~ msgstr "citymap" - -#~ msgid "hikingmap" -#~ msgstr "hikingmap" - -#~ msgid "map" -#~ msgstr "map" - -#~ msgid "bicyclemap" -#~ msgstr "bicyclemap" - -#~ msgid "board" -#~ msgstr "board" - -#~ msgid "Charge" -#~ msgstr "Charge" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK+)" - -#~ msgid "Ill-formed node id" -#~ msgstr "Ill-formed node id" - -#~ msgid "Found element in non-relation." -#~ msgstr "Found element in non-relation." - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." - -#~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " -#~ "- these will then show up in the WMS menu.\n" -#~ "\n" -#~ "You can also do this manually in the Advanced Preferences, using the " -#~ "following schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n" -#~ "format=image/jpeg \n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " -#~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " -#~ "in this example,replacing 73 with your image id: \n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ " \n" -#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " -#~ "use." -#~ msgstr "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " -#~ "- these will then show up in the WMS menu.\n" -#~ "\n" -#~ "You can also do this manually in the Advanced Preferences, using the " -#~ "following schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?" -#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/" -#~ "jpeg\n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " -#~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " -#~ "in this example,replacing 73 with your image id:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?" -#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n" -#~ "format=image/png" - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS" - -#~ msgid "Portcullis" -#~ msgstr "Portcullis" - -#~ msgid "Empty member in relation." -#~ msgstr "Empty member in relation." - -#~ msgid "Replaces Selection with Users data" -#~ msgstr "Replaces Selection with Users data" - -#~ msgid "Please choose a user using the author panel" -#~ msgstr "Please choose a user using the author panel" - -#~ msgid "Sorry, doesn't work with anonymous users" -#~ msgstr "Sorry, doesn't work with anonymous users" - -#~ msgid "Open User Page" -#~ msgstr "Open User Page" - -#~ msgid "Please select some data" -#~ msgstr "Please select some data" - -#~ msgid "Open User Page in browser" -#~ msgstr "Open User Page in browser" - -#~ msgid "Select User's Data" -#~ msgstr "Select User's Data" - -#~ msgid "Show Author Panel" -#~ msgstr "Show Author Panel" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." - -#~ msgid "Upload to OSM..." -#~ msgstr "Upload to OSM..." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Authors: {0}" -#~ msgstr "Authors: {0}" - -#~ msgid "Layers: {0}" -#~ msgstr "Layers: {0}" - -#~ msgid "History of Element" -#~ msgstr "History of Element" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Conflicts: {0}" - -#~ msgid "viaduct" -#~ msgstr "viaduct" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "" -#~ "Opens the OpenStreetBugs window and activates the automatic download" - -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "Please select one or more closed ways of at least four nodes." - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "" -#~ "Skipping a way because it includes a node that doesn''t exist: {0}\n" - -#~ msgid "sports" -#~ msgstr "sports" - -#~ msgid "Public" -#~ msgstr "Public" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "Selected makes your trace public in openstreetmap.org" - -#~ msgid "Open a layer first (GPX, OSM, cache)" -#~ msgstr "Open a layer first (GPX, OSM, cache)" - -#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -#~ msgstr "" -#~ "Set manually the Lambert zone (e.g. for locations between two zones)" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Select Tableau d'Assemblage" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" - -#~ msgid "Remove Selected" -#~ msgstr "Remove Selected" - -#~ msgid "Basic" -#~ msgstr "Basic" - -#~ msgid "Delete Layer" -#~ msgstr "Delete Layer" - -#~ msgid "Delete and Download" -#~ msgstr "Delete and Download" - -#~ msgid "Combine Anyway" -#~ msgstr "Combine Anyway" - -#~ msgid "Merge Anyway" -#~ msgstr "Merge Anyway" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "No intersection found. Nothing was changed." - -#~ msgid "Continue anyway" -#~ msgstr "Continue anyway" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading." - -#~ msgid "Move Down" -#~ msgstr "Move Down" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relation Editor: {0}" - -#~ msgid "Move Up" -#~ msgstr "Move Up" - -#~ msgid "Update Data" -#~ msgstr "Update Data" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." - -#~ msgid "Change the projection to {0} first." -#~ msgstr "Change the projection to {0} first." - -#~ msgid "Invalid projection" -#~ msgstr "Invalid projection" - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Edit Drawbridge" - -#~ msgid "Edit Portcullis" -#~ msgstr "Edit Portcullis" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" - -#~ msgid "Board Type" -#~ msgstr "Board Type" - -#~ msgid "Edit Information Office" -#~ msgstr "Edit Information Office" - -#~ msgid "Map Type" -#~ msgstr "Map Type" - -#~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to " -#~ "selected user, opens browser showing selected author profile page." -#~ msgstr "" -#~ "Tools to work with authors/users. Selects map data that belongs to " -#~ "selected user, opens browser showing selected author profile page." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Directly load TCX files from JOSM." - -#~ msgid "" -#~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to " -#~ "OSM eg. deleting uninteresting parts of track." -#~ msgstr "" -#~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM " -#~ "eg. deleting uninteresting parts of track." - -#~ msgid "Remove route nodes" -#~ msgstr "Remove route nodes" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Login name (e-mail) to the OSM account." - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "The following errors occurred during mass download:" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "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." - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "An error occurred while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." - -#~ msgid "Error processing changeset upload response" -#~ msgstr "Error processing changeset upload response" - -#~ msgid "Version number missing from OSM data" -#~ msgstr "Version number missing from OSM data" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 45.7° and 47.9°\n" -#~ "and longitutes between 5.7° and 10.6° only.\n" -#~ "Use another projection system if you are not working\n" -#~ "on a data set of Switzerland or Liechtenstein.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 45.7° and 47.9°\n" -#~ "and longitutes between 5.7° and 10.6° only.\n" -#~ "Use another projection system if you are not working\n" -#~ "on a data set of Switzerland or Liechtenstein.\n" -#~ "Do not upload any data after this message." - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Data upload failed for unknown reason" - -#~ msgid "Cannot read numeric value from response" -#~ msgstr "Cannot read numeric value from response" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Image with path {0} does not exist or is not readable." - -#~ msgid "% of lon:" -#~ msgstr "% of lon:" - -#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}." - -#~ msgid "Resolve conflicts in member list of of relation {0}" -#~ msgstr "Resolve conflicts in member list of relation {0}" - -#~ msgid "parameter '{0}' must not be null" -#~ msgstr "parameter '{0}' must not be null" - -#~ msgid "" -#~ "Properties in the merged element. They will replace properties in my " -#~ "elements when merge decisions are applied." -#~ msgstr "" -#~ "Properties in the merged element. They will replace properties in my " -#~ "elements when merge decisions are applied." - -#~ msgid "WARNING: unexpected value for preference conflict.resolution, got " -#~ msgstr "WARNING: unexpected value for preference conflict.resolution, got " - -#~ msgid "Apply partial resolutions" -#~ msgstr "Apply partial resolutions" - -#~ msgid "" -#~ "The OSM primitive with id {0} has been " -#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " -#~ "primitive will be assigend a new id.
Click {2} to " -#~ "accept the state on the server and to delete your primitive.
Click " -#~ "{3} to cancel.
" -#~ msgstr "" -#~ "The OSM primitive with id {0} has been " -#~ "deleted
on the server by another mapper.

Click {1} to keep your primitive and ignore the deleted state.
Your " -#~ "primitive will be assigned a new id.
Click {2} to " -#~ "accept the state on the server and to delete your primitive.
Click " -#~ "{3} to cancel.
" - -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Checking whether node {0} is gone ..." - -#~ msgid "Undeleting relation..." -#~ msgstr "Undeleting relation..." - -#~ msgid "Undeleting Way..." -#~ msgstr "Undeleting Way..." - -#~ msgid "Missing primitive" -#~ msgstr "Missing primitive" - -#~ msgid "Checking whether primitive {0} is gone ..." -#~ msgstr "Checking whether primitive {0} is gone ..." - -#~ msgid "Update failed" -#~ msgstr "Update failed" - -#~ msgid "" -#~ "There are {0} primitives
selected for " -#~ "individual update. Please reduce the selection
to max. {1} primitives." -#~ "" -#~ msgstr "" -#~ "There are {0} primitives
selected for " -#~ "individual update. Please reduce the selection
to max. {1} primitives." -#~ "" - -#~ msgid "Selection too big" -#~ msgstr "Selection too big" - -#~ msgid "Updates the currently selected primitives from the server" -#~ msgstr "Updates the currently selected primitives from the server" - -#~ msgid "Conflict detected" -#~ msgstr "Conflict detected" - -#~ msgid "Upload to OSM API failed" -#~ msgstr "Upload to OSM API failed" - -#~ msgid "" -#~ "Uploading failed because a primitive you tried " -#~ "to
delete on the server is already deleted.

The error message " -#~ "is:
{0}" -#~ msgstr "" -#~ "Uploading failed because a primitive you tried " -#~ "to
delete on the server is already deleted.

The error message " -#~ "is:
{0}" - -#~ msgid "Primitive already deleted" -#~ msgstr "Primitive already deleted" - -#~ msgid "nodes" -#~ msgstr "nodes" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Purging 1 primitive" - -#~ msgid "ways" -#~ msgstr "ways" - -#~ msgid "relations" -#~ msgstr "relations" - -#~ msgid "Error when communicating with server." -#~ msgstr "Error when communicating with server." - -#~ msgid "Didn't find an historized primitive with id {0} in this dataset" -#~ msgstr "Didn't find an historized primitive with id {0} in this dataset" - #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" @@ -28321,4 +28452,7 @@ #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" #~ msgstr "Warning: failed to put a dialog always on top. Exception was: {0}" + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Can't search because there is no loaded data." #~ msgid "" @@ -28432,4 +28566,7 @@ #~ "\"{1}\">your language." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Didn't find an primitive with id {0} in this dataset" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Help page missing. Create it in English." @@ -28445,4 +28582,16 @@ #~ msgstr "unexpected return value. Got {0}" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "There's no primitive with version {0} in this history" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "There's no version valid at date ''{0}'' in this history" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "no earliest version found. History is empty." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "no latest version found. History is empty." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "index out of bounds Got {0}" @@ -28469,4 +28618,7 @@ #~ msgstr "Replace the way this member refers to with the combined way" +#~ msgid "No type found. History is empty." +#~ msgstr "No type found. History is empty." + #~ msgid "Preset group ''{0}'' of group ''{1}''" #~ msgstr "Preset group ''{0}'' of group ''{1}''" Index: applications/editors/josm/i18n/po/es.po =================================================================== --- applications/editors/josm/i18n/po/es.po (revision 18772) +++ applications/editors/josm/i18n/po/es.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-16 19:38+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-20 10:48+0000\n" "Last-Translator: Emilio Gomez Fernandez \n" "Language-Team: Spanish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:08+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Ayuda" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formado: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,22 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de archivo malformado: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"No se puede leer el archivo ''{0}''.
El error es:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,18 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"No se puede leer el archivo ''{0}''.
El error es:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Error" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -311,5 +312,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -318,27 +319,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -356,5 +357,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Cancelar" @@ -364,19 +365,19 @@ msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Por favor, selecciona la capa objetivo." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Seleccionar la capa objetivo" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Unir" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -386,5 +387,5 @@ "No hay capas de capa fuente
\"{0}\"
podría ser unida a." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Ninguna capas de objetivo" @@ -497,13 +498,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -601,20 +602,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Archivo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "No hay conjuntos de cambios abiertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Ningún conjunto de cambios abiertos" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -654,10 +655,10 @@ "única de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona al menos dos vías para combinar." @@ -703,10 +704,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -725,11 +726,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Sobrescribir" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "El archivo existe. ¿Sobrescribir?" @@ -779,5 +780,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -786,6 +787,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -801,7 +802,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -829,5 +829,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplicar" @@ -851,30 +851,30 @@ msgstr "Salir de la aplicación" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Todos los formatos" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportar a GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportar los datos a archivo GPX" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nada que exportar. Obtén algunos datos primero" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -882,13 +882,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -907,8 +907,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -916,7 +916,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -939,9 +939,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -953,5 +953,5 @@ msgstr "el parámetro ''{0}'' no debe ser nulo" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -959,5 +959,5 @@ msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exportar archivo GPX" @@ -1105,6 +1105,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nuevo" @@ -1240,5 +1240,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Pegar" @@ -1328,11 +1328,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Guardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Guardar los datos actuales." @@ -1389,10 +1389,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Guardar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Guardar los datos actuales en un nuevo archivo." @@ -1411,10 +1411,10 @@ "selecciona los objetos incompletos." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Mostrar informe de estado" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1422,20 +1422,20 @@ "errores." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Ayuda: : {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Informe de estado" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Copiar al portapapeles y cerrar" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1601,5 +1601,5 @@ msgstr "Nodo despegado" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1607,5 +1607,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1647,18 +1647,18 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 msgid "Updates the objects in the active data layer from the server." -msgstr "" +msgstr "Actualizar desde el servidor los objetos en la capa de datos activa." #. bounds defined? => use the bbox downloader #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Descargar datos" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Actualización de datos no encontrada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" @@ -1666,10 +1666,9 @@ "No se ha encontrado ningún objeto con ID {0} en el conjunto de datos actual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Actualizar selecciones" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Actualizar selección" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1678,32 +1677,31 @@ "descarga de datos)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Actualización de selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "No hay primitivas seleccionadas para actualizar" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "No hay objetos seleccionados que actualizar." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Selección vacía" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Actualizar selecciones" - +msgstr "Cargando objetos" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Subir datos" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +"Actualizar en el servidor todos los objetos en la capa de datos activa." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1714,5 +1712,5 @@ "corregirlos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1720,29 +1718,29 @@ msgstr "Ningún cambio que subir" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algunos datos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Sincronizar únicamente el nodo {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Sincronizar únicamente la vía {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Sincronizar únicamente la relación {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Sincronizar el conjunto de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1764,11 +1762,11 @@ "continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Se han detectado conflictos" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1784,5 +1782,5 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1796,22 +1794,22 @@ "uno existente y abierto." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Conjunto de cambios cerrados" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "Preparar la resolución de conflictos" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "Haz click para cancelar y continuar editando el mapa" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1822,19 +1820,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "Nodo todavía en uso" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Oinarrizkoa eguneratzen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1843,5 +1841,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1850,15 +1848,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +msgstr "Subiendo {0} objetos..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1875,10 +1873,10 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259 msgid "Checking parents for deleted objects" -msgstr "" +msgstr "Verificando padres para los objetos borrados" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318 #, java-format msgid "Reading parents of ''{0}''" -msgstr "" +msgstr "Leyendo padres de ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324 @@ -1970,17 +1968,17 @@ msgstr "Avance lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Datos GPX descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Descargando datos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1989,5 +1987,5 @@ "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "No se han encontrado datos para este area." @@ -2004,5 +2002,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157 msgid "Check on the server" -msgstr "" +msgstr "Verificar en el servidor" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159 @@ -2011,4 +2009,6 @@ "server" msgstr "" +"Clic para verificar si los objetos de su conjunto de datos locales están " +"borrados en el servidor" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163 @@ -2044,12 +2044,12 @@ #, java-format msgid "The following errors occurred during mass download: {0}" -msgstr "" +msgstr "Los siguientes errores se produjeron durante la descarga masiva: {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Errores durante la descarga" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "Errores durante la descarga" @@ -2067,5 +2067,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2073,5 +2073,5 @@ msgstr "Modo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2168,8 +2168,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." msgstr "" -"Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2179,9 +2177,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Arrastre el segmento de la vía para hacer un rectángulo." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2196,5 +2193,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2214,17 +2211,17 @@ msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Mover elementos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Moverlos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Deshacer mover" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2233,18 +2230,18 @@ "Really move them?" msgstr "" -"Has movido más de {0} elementos. El mover un número elevado de elementos es " +"Ha movido más de {0} elementos. El mover un número elevado de elementos es " "frecuentemente un error.\n" -"¿Deseas moverlos realmente?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +"¿Desea desplazarlos realmente?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" "Soltar el botón del ratón para seleccionar los objetos en el rectángulo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2253,9 +2250,9 @@ "más cercano." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Soltar el botón del ratón para parar de rotar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2265,15 +2262,15 @@ "alternar); Shift-Ctrl para rotar lo seleccionado, o cambiar la selección" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Alejar/acercar y mover mapa" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2283,10 +2280,10 @@ "abajo, derecha; mover el zoom con el botón derecho" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Buscar ..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2295,58 +2292,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Por favor, introduce una cadena de caracteres como filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Por favor, introduzca una cadena de búsqueda." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "expresión regular" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "Introduzca la expresión de búsqueda" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "reemplazar selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "añadir a la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "eliminar de la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "encontrar en la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "distinguir mayúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "expresión regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Calle Mayor - 'Calle' y 'Mayor' en cualquier clave o valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Calle Mayor\" - 'Calle Mayor' en cualquier clave o nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:May - 'May' en cualquier parte del nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - clave 'type' con el valor exacto 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2356,17 +2352,17 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:May - sin 'May' en el nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - cualquier valor presente en clave=foot" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Búsquedas especiales:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" @@ -2375,40 +2371,42 @@ "relation)" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "user:... - all objects changed by user" +msgstr "" +"user:... - todos los objetos modificados por un determinado usuario" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -msgid "user:... - all objects changed by user" -msgstr "" -"user:... - todos los objetos modificados por un determinado usuario" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objecto con el ID indicado (0 para los objetos nuevos)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objetos con un determinado número de nodos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" "max)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +"tags:... - objeto con un número dado de etiquetas (tags:total o tags:" +"min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - todos los objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - todos los objetos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos los objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - todos los objetos sin etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" @@ -2417,5 +2415,5 @@ "la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" @@ -2424,5 +2422,5 @@ "cumplan la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2430,14 +2428,14 @@ "lógico O (disyunción)" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Usar \" para delimitar operadores (por ejemplo si la clave contiene :)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Usar \" para delimitar operadores (por ejemplo si la clave contiene :)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "Usar ( y ) para agrupar expresiones" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2447,51 +2445,51 @@ msgstr "Filtrar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Enviar filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Iniciar búsqueda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "No se encontraron coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "No se ha añadido nada a la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "No se ha quitado nada de la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "No se ha encontrado nada en la selección buscando por ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Se han encontrado {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2509,5 +2507,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2515,10 +2513,10 @@ "de uso: clave=valor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2527,26 +2525,26 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Credencial de autentificación inexperada: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "No se encuentran los argumentos de or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "No se encuentran los argumentos de not" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Se esperaba un cierre de paréntesis." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "Número de parámetros erróneos para las etiquetas de operador" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2554,10 +2552,12 @@ "or range, for example tags:1 or tags:2-5" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +"Valor incorrecto del operador tags: {0}. El operado tags espera un numero o " +"rango de etiquetas, por ejemplo tags:1 o tags:2-5" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parámetros incorrecto para el operador de nodos." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2568,5 +2568,5 @@ "número de nodos o un intervalo, por ejemplo nodos:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2673,7 +2673,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2785,5 +2785,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Doble conflicto" @@ -2812,5 +2812,5 @@ "presente." -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2818,6 +2818,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "no se puede resolver los conflictos pendientes" @@ -2887,18 +2887,8 @@ msgstr "Confirmación antes de borrar" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Resolver los conflictos en el estado de borrado en {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2933,10 +2923,10 @@ msgstr "Eliminando referencia de la relación {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolver conflictos en la lista de miembros de la relación {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2971,20 +2961,20 @@ msgstr "Secuencia" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Resolver {0} conflictos de etiquetado en el nodo {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Resolver {0} conflictos de etiquetado en la vía {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Resolver {0} conflictos de etiquetado en la relación {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -3006,10 +2996,10 @@ msgstr "Resolver conflictos de versión para la relación {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Resolver conflictos en la lista de nodos de la vía {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3054,5 +3044,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nuevo valor" @@ -3085,5 +3075,5 @@ #, java-format msgid "Expected array of length 4, got {0}" -msgstr "" +msgstr "Esperada una matriz de longitud 4, obtenida {0}" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:62 @@ -3099,7 +3089,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3108,10 +3098,10 @@ msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Archivo de configuración malformado en las lineas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3122,5 +3112,5 @@ "preferencias ''{0}'' no es un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3131,5 +3121,5 @@ "preferencias ''{0}'' no es un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3140,5 +3130,5 @@ "de preferencias desaparecido: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3149,5 +3139,5 @@ "directorio de preferencias desaparecido: {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3157,5 +3147,5 @@ "preferencias por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3166,5 +3156,5 @@ "archivo por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3175,5 +3165,5 @@ "archivo de preferencias por defecto:{0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3185,5 +3175,5 @@ "defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3194,10 +3184,10 @@ "de preferencias por defecto. {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3280,25 +3270,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3306,11 +3296,13 @@ msgstr "Conjunto de cambios {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" "Unable to add primitive {0} to the dataset because it's already included" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +"No se puede agregar la primitiva {0} al conjunto de datos porque ya está " +"incluida" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3319,27 +3311,30 @@ "error, it should be safe to continue in your work." msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +"JOSM esperaba encontrar la primitiva [{0} {1}] en el conjunto de datos pero " +"no fue así. Por favor, informe de ello en http://josm.openstreetmap.de. Este " +"no es un error crítico, puede continuar con su trabajo de manera segura." + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "No se encuentran los argumentos de not" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "Histórico de la relación {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3348,6 +3343,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3355,7 +3350,4 @@ "Keeping target object. " msgstr "" -"Mi primitiva con el ID {0} y versión {1} es visible, aunque su versión " -"primitiva con la versión inferior {2} no es visible. No se puede hacer " -"frente a esta incongruencia. Se mantiene mi primitiva. " #. translators notes must be in front @@ -3412,24 +3404,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Se esperaba un ID >=0. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "una proimitiva con id=0 no puede ser invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "Se esperaba un ID >0. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "Se esperaba una versión > 0. Encontrada {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3437,5 +3429,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3463,10 +3455,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3477,7 +3469,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"." +msgstr "Paŕametro esperado ''{0}'' > 0, obtenido {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3496,9 +3488,9 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." msgstr "" -"no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID " -"''{1}''" +"No se puede comparar la primitiva con ID \"{0}\" con la primitiva con ID " +"\"{1}\"" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3633,10 +3625,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3648,6 +3640,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3657,5 +3649,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3665,6 +3657,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3682,6 +3674,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "fondo" @@ -3699,26 +3691,38 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"IMPORTANTE: los datos están posicionados\n" -"lejos de los límites de la Zona Lambert.\n" -"No suba ningún dato después de este mensaje.\n" -"Deshaga su última acción, guarde su trabajo\n" -"y cree una nueva capa en otra zona." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +msgstr "Zonas Lambert 4 (Francia)" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Zona Lambert" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" -msgstr "" +msgstr "Zona Lambert CC9 (Francia)" #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96 @@ -3730,27 +3734,56 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zona UTM" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Rejilla suiza (Suiza)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "Zona UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3766,10 +3799,10 @@ msgstr "No se ha podido grabar el marcador.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "No mostrar de nuevo" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3777,32 +3810,32 @@ msgstr " [ID: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "vía" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "ferrocarril" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vía fluvial" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "uso del suelo" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3811,5 +3844,5 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3847,6 +3880,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflicto" @@ -3856,11 +3889,11 @@ msgstr "Host desconocido" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Objeto borrado" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3877,5 +3910,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82 msgid "Click to close the dialog" -msgstr "" +msgstr "Haga clic para cerrar el cuadro de diálogo" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 @@ -4068,11 +4101,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4187,5 +4220,5 @@ msgstr "La longitud del nuevo segmento de línea que se está dibujando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4193,18 +4226,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(sin objeto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Usuario:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "capa no listada" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4213,5 +4246,5 @@ #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50 msgid "Click to cancel the current operation" -msgstr "" +msgstr "Haga clic para cancelar la operación actual" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -4264,18 +4297,18 @@ msgid "Deleting {0} object" msgid_plural "Deleting {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Borrando {0} objeto" +msgstr[1] "Borrando {0} objetos" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142 msgid "Delete objects" -msgstr "" +msgstr "Borrar objetos" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285 msgid "To delete" -msgstr "" +msgstr "A borrar" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294 msgid "From Relation" -msgstr "" +msgstr "Desde la relación" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303 @@ -4296,8 +4329,12 @@ msgid "Click to close the dialog and remove the object from the relations" msgstr "" +"Haga clic para cerrar el cuadro de diálogo y eliminar el objeto de las " +"relaciones" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" +"Haga clic para cerrar el cuadro de diálogo y abortar la eliminación de los " +"objetos" #. * @@ -4327,50 +4364,50 @@ msgstr "La función {0} no participa en la pareja de comparación {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Nodos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Miembros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Ningún conflito de etiqueta pendiente de ser resuelto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Etiquetas ({0} conflictivas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} etiquetas conflictivas pendientes de ser resueltas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Nodos (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4379,17 +4416,17 @@ "lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Nodos (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Conflictos pendientes en la lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Miembros (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4399,64 +4436,64 @@ "lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Miembros (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Conflictos pendientes en la lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Ningún conflicto de propiedades pendiente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Propiedades (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Conflictos de propiedades pendientes de resolver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Resolución de conflictos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "pa´rametro actual fuera del rango: obtenido {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "inexperado valor del parámetro \"index\". Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "objeto {0} no encontrado en la lista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "bloquear desplazamiento" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Comparar " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Mi versión" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" @@ -4464,5 +4501,5 @@ "locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4470,5 +4507,5 @@ msgstr "Versión fusionada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4478,10 +4515,10 @@ "la decisión de combinarlos." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Su versión" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" @@ -4489,18 +4526,18 @@ "del servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> arriba" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" "Copiar mis nodos seleccionados al inicio de la lista de nodos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> abajo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4508,5 +4545,5 @@ "fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4516,5 +4553,5 @@ "la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4524,5 +4561,5 @@ "en la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4530,5 +4567,5 @@ "Copiar su elemento seleccionado al inicio de la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4536,5 +4573,5 @@ "fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4544,5 +4581,5 @@ "la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4552,55 +4589,55 @@ "la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Subir" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Subir los elementos seleccionados una posición" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Bajar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Bajar las entradas seleccionadas una posición" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Eliminar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" "Eliminar las entradas seleccionadas de la lista de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Congelar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Congelar la lista actual de elementos fusionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Desconjelar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4611,5 +4648,5 @@ "las suyas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4620,5 +4657,5 @@ "las suyas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4627,5 +4664,5 @@ msgstr[1] "Mi versión ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4634,5 +4671,5 @@ msgstr[1] "Versión fusionada ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4641,6 +4678,6 @@ msgstr[1] "Su versión ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4649,6 +4686,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4659,5 +4696,5 @@ msgstr "Nodo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4671,5 +4708,5 @@ msgstr "índice de columna inexperado. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4680,19 +4717,19 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Comunicación fallida con el servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Sí, deshacer el borrado de ellos también" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "No, calcelar la operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4704,9 +4741,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "¿Deshacer el borrado de los nodos adicionales?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4719,5 +4756,5 @@ "borrado de los primitivos?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "¿Deshacer borrado de primitivos dependientes?" @@ -4746,84 +4783,84 @@ msgstr "Coordenadas:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Estado borrado:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Estado visible:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(ninguno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "no borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "visible (en el servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "no visible (en el servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Mantener un clon de la versión local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Eliminar físicamente del conjunto de datos locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Mantener mis coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Mantener sus coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Conflicto no resuelto entre las diferentes coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Mantener mi estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Mantener su estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Mantener mi estado visible" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Sí, reiniciar el id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "No, abortar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4833,17 +4870,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Reiniciar el id a 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Mantener su estado visible" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Sí, purgarlo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4852,9 +4889,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Eliminar desde el conjunto de datos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Conflicto entre estado visibles sin decidir" @@ -4871,19 +4908,19 @@ "de resolución." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4900,10 +4937,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4913,10 +4950,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4943,15 +4980,15 @@ msgstr "Su versión (conjunto de datos del servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" "Mantener la pareja clave/valor seleccionado del conjunto de datos locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" @@ -4959,14 +4996,14 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Pendiente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Marcar la etiqueta seleccionada como pendiente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4991,22 +5028,22 @@ msgstr "Ningún conflicto que resolver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Cancelar resolución de conflicto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Aplicar la resolución de conflictos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5014,5 +5051,5 @@ msgstr "ninguno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5103,6 +5140,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5113,5 +5150,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5125,21 +5162,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "Mantener" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "Indeciso" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "Aún no decidido" @@ -5147,5 +5184,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Función:" @@ -5168,5 +5205,5 @@ msgctxt "tag" msgid "Key:" -msgstr "" +msgstr "Clave:" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108 @@ -5219,5 +5256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 msgid "Show tags with conflicts only" -msgstr "" +msgstr "Mostrar solo etiquetas con conflictos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -5232,10 +5269,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5255,13 +5292,13 @@ msgstr "Pila de comandos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +msgstr "Resolver conflictos." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5269,5 +5306,5 @@ "en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5277,25 +5314,25 @@ "Selecciona en el mapa los elementos seleccionados en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancelar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplicar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Aplicar resolución" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Cerrar de todos modos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Continuar resolviendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5307,13 +5344,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Conflicto no resuelto completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Resolver los conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5325,8 +5362,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5393,5 +5430,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5424,34 +5461,34 @@ msgstr "Abrir un listado de todas las capas cargadas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Borrar la capa seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Mostrar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Cambia estado de visibilidad de la capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Activar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Activa la capa selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Combina esta capa con otra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Mover la capa seleccionada una fila arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Mover la capa seleccionada una fila abajo" @@ -5461,18 +5498,17 @@ msgstr "Información de capa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Esto cambiará {0} objeto." -msgstr[1] "Esto cambiará {0} objetos." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Un valor vacío elimina la clave." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5481,10 +5517,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "¿Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5493,5 +5529,5 @@ msgstr[1] "Cambiar las propiedades de hasta {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5500,9 +5536,9 @@ msgstr[1] "Esto cambiará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Por favor, selecciona una etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Por favor, selecciona un valor" @@ -5527,102 +5563,98 @@ msgstr "Miembro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Añadir propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Propiedades: {0} / Miembros: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Propiedades / Miembros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Cambiar relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Borrar de la relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "¿Seguro de eliminar la selección de la relación {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Borrar la clave seleccionada en todos los objetos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Eliminar propiedades" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Añadir una nueva pareja clave/valor para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Editar propiedades" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Editar el valor de la clave seleccionada para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Propiedades: {0} / Miembros: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Propiedades / Miembros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Cambiar relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Borrar de la relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "¿Seguro de eliminar la selección de la relación {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Borrar la clave seleccionada en todos los objetos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Eliminar propiedades" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Abrir una lista de todas las relaciones." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relaciones: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Abrir un editor para la relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Borrar la relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Crear un anueva relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "Crea una copia de esta relación y la abre en otra ventana de edición." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5651,5 +5683,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5661,9 +5693,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Desacoplar el panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5672,5 +5704,5 @@ "herramientas de la izquierda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Haga click para minimizar/maximizar el contenido del panel" @@ -5753,12 +5785,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Descargar relación de miembros" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Conflictos en dato" @@ -5776,5 +5808,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5782,5 +5814,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5788,18 +5820,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Etiquetas y miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5808,14 +5840,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Eliminarlos, limpiar la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Ignorarlos, dejar la relación como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5825,9 +5857,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5837,15 +5869,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5853,5 +5885,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5859,20 +5891,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5881,66 +5913,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Ordenar los miembros de la relación" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Editor de relaciones: Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Mover los miembro(s) seleccionos hacia arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Editor de relaciones: Mover arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Mover los miembros seleccionados hacia abajo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Editor de relaciones: Mover abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Editor de relaciones: Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Sí, crear un conflicto y cerrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "No, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5949,9 +5981,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Conflicto en los datos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5960,41 +5992,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Aplicar las actualizaciones actuales" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Aplicar las actualizaciones y cerrar el diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Añadir una etiqueta vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Descargar todas las vías y nodos incompletos de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Fijar una función para los miembros seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Aplicar función" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -6004,19 +6036,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Sí, aplícalo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "No, no lo apliques" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Confirmar función vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Descargando relación {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -6037,12 +6076,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Se refiere a" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Vinculado" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 msgid "Download referring relations" @@ -6054,5 +6089,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6122,9 +6157,9 @@ msgstr "Marcadores" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6133,52 +6168,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "latitud mínima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "longitud mínima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "latitud máxima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "longitud máxima" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6187,52 +6222,52 @@ "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Recuadro delimitador" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Fuentes de datos y tipos" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Datos OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Datos GPS en bruto" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Descargar como nueva capa" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6240,18 +6275,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Descargar área" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Descargar" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -6259,5 +6294,5 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -6265,17 +6300,17 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6297,21 +6332,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "Buscar..." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -7050,8 +7085,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7224,5 +7259,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7234,5 +7269,5 @@ msgstr "Tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7279,5 +7314,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7291,5 +7326,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7300,5 +7335,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7307,19 +7342,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7329,32 +7364,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7376,5 +7411,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7436,12 +7471,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7466,33 +7501,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Nodo {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zoom al problema" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Cargar historial" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Vía {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7501,7 +7534,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Ordenar menú de preajustes" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7519,7 +7551,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7547,10 +7578,8 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" -"Pulsar {0} para iniciar la fusión de mis entradas y " -"las suyas" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7561,7 +7590,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7589,17 +7617,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versión {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "borrado" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Versión {0} creada en {1} por {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7652,10 +7679,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Seleccione nombre de fichero" @@ -7868,5 +7895,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7889,17 +7916,17 @@ msgstr "Capa" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "¿Debe subirse?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "¿Debe grabarse?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Nombre de archivo" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7915,7 +7942,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Etiquetas del nuevo conjunto de cambios" @@ -7958,29 +7985,29 @@ msgstr[1] "{0} objetos para eliminar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Subir cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7990,39 +8017,39 @@ "petición por cambio sencillo" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Abrir un nuevo conjunto de cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" "Abrir un nuevo conjunto de cambios y usarlo en la siguiente subida de datos" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Usar un nuevo conjunto de cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Subir datos a un conjunto de cambios abierto" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Cerrar conjunto de cambios despues de subir los datos" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -8030,16 +8057,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8085,24 +8112,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Imágenes para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Leer gpx" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "No hay hora para el punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8110,34 +8137,34 @@ msgstr "Leyendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "" "No se han encontrado imágenes con metadatos legibles sobre la fecha y hora." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Imagenes Geoetiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Iniciar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Finalizar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "diferencia de zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8146,14 +8173,14 @@ msgstr[1] "imagenes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} dentro de la traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Sincronizar reloj" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8161,32 +8188,32 @@ msgstr "Imágenes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Imagen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horaria del GPS (diferencia con la foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar hora con la del receptor GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "La hora no pudo ser analizada sintácticamente." @@ -8276,5 +8303,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8326,10 +8353,10 @@ msgstr[1] "{0} nodos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8339,11 +8366,11 @@ "peligroso.
Si quiere subir trazas, consulte aquí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces (EN)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8353,29 +8380,29 @@ msgstr "Convertido desde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Descargar datos de OSM a lo largo de esta traza" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Descargar todo entre:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8386,9 +8413,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "No hay traza gpx disponible en la capa para asociar el audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8399,5 +8426,5 @@ "comienzo." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8407,23 +8434,23 @@ "tiempos fueran razonablemente estimados se han omitido." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "fuera del área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8432,5 +8459,5 @@ msgstr[1] "Se han detectado {0} conflictos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8444,5 +8471,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8453,13 +8480,17 @@ "Dialog and manually resolve them." msgstr[0] "" +"{0} conflicto sigue sin resolverse.

Por favor, abra el cuadro de " +"dialogo de Conflictos y resuélvalo manualmente." msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +"{0} conflicto2 siguen sin resolverse.

Por favor, abra el cuadro de " +"dialogo de Conflictos y resuélvalos manualmente." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8468,22 +8499,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "sin ajustar" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Versión del API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convertir a capa de gpx" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "No se ha encontrado ninguna vía \"desde\"." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8581,9 +8625,9 @@ msgstr "No existen marcadores de audio en esta capa desde los que desplazar." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Mostrar/Esconder Texto/Iconos" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8653,5 +8697,5 @@ "usado todavía)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8659,5 +8703,5 @@ msgstr "Por favor, seleccione la fila a editar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8665,5 +8709,5 @@ msgstr "Nuevo valor de {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8672,5 +8716,5 @@ msgstr "Por favor, seleccione la fila a borrar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Introduzca un par parámetro/valor" @@ -8813,40 +8857,40 @@ msgstr "Calibración del grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Color" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Estilo de representación {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Capa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Seleccionar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Seleccionar un color para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Establecer como predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Establecer todo como predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Colores usados por diferentes objetos en JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Colores" @@ -9012,5 +9056,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82 msgid "Draw lines between raw GPS points" -msgstr "Dibujar líneas entre puntos GPS" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 @@ -9298,17 +9342,17 @@ msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Visualizar las coordenadas como" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Método de proyección" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "Límites" @@ -9318,5 +9362,5 @@ msgstr "Proyección del mapa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9374,82 +9418,82 @@ msgstr "Atajo de teclado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "Estilos disponibles (desde {0})" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Rutas del icono" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Descripción corta: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Autor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Página web: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Versión: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" "Añadir los estilos seleccionados disponibles a la lista de estilos activos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "Recarga la lista de estilos disponibles desde ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9458,6 +9502,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9649,10 +9693,10 @@ msgstr "Grupos de modificadores" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9662,13 +9706,13 @@ msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Añadir una nueva etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9676,18 +9720,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Atributos opcionales" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "vía sin salida" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconocido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9698,15 +9742,15 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Error analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Los elementos del tipo {0} son soportados" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9716,18 +9760,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -9743,6 +9787,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9751,8 +9795,21 @@ msgstr "Contactando con el servidor OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Descargando puntos {0} al {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9871,11 +9928,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9885,40 +9942,40 @@ msgstr "Descargando datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Obteniendo nodo con ID {0} de ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Obteniendo vía con ID {0} de ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Obteniendo relación con ID {0} de ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Obteniendo un conjunto de nodos de ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Obteniendo un conjunto de vías de ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Obteniendo un conjunto de relaciones de ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9983,5 +10040,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9994,66 +10051,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Conjunto de cambios {0} abierto con éxito" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Actualizando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Actualizando conjunto de cambios {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Cerrando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Preparando…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Subiendo..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Esperando 10 segundos... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Reintentando {0} de {1} en {2} segundos..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - intentando de nuevo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "Reintentando {0} de {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "El conjunto de cambios actual es nulo. Los datos no se pueden subir." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10088,5 +10145,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10113,5 +10170,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10119,5 +10176,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10130,5 +10187,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10289,5 +10346,5 @@ msgstr "El archivo \"{0} no existe" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10296,38 +10353,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Valor ilegal del atributo \"ref\" del elemento . Es {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10335,19 +10392,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta sin ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Objeto con id=0 ilegal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10357,10 +10414,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10370,25 +10425,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Versión del API desconocida o no soportada. Es {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10632,7 +10687,8 @@ "Update plugins now?" msgstr "" -"Acabas de actualizar tu JOSM.\n" -"Para evitar problemas los componentes deben actualizarse también.\n" -"¿Deseas actualizar los componentes ahora?" +"Acaba de actualizar su JOSM.\n" +"Para evitar problemas también debería actualizar los componentes " +"instalados.\n" +"¿Desea actualizar los componentes ahora?" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114 @@ -10863,5 +10919,5 @@ msgstr "(El texto ya ha sido copiado a tu portapapeles.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10870,12 +10926,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10885,5 +10934,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10896,10 +10945,5 @@ "
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10908,5 +10952,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10915,5 +10959,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10922,9 +10966,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10937,5 +10988,5 @@ "miniaplicacióin
y no lo ha cargado desde ''{1}''." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10946,5 +10997,5 @@ "favor, compruebe su conexión de Internet." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10955,5 +11006,5 @@ "con la transferencia de datos
Detalles (sin traducir): {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10965,10 +11016,10 @@ "favor." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "El servidor OSM ''{0}'' informa de una mala solicitud.
" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10980,10 +11031,10 @@ "exportado proporcionado por la comunidad de OSM." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "
Mensaje de error (sin traducir): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10994,5 +11045,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -11002,5 +11053,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11756,5 +11807,5 @@ msgstr "Error en archivo {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11767,29 +11818,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Error al leer el archivo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Archivo caché de la zona Lambert 1 (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Archivo caché de la zona Lambert 1 (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Archivo caché de la zona Lambert 2 (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Archivo caché de la zona Lambert 3 (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Archivo caché de la zona Lambert 4 (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11818,13 +11889,13 @@ msgstr "Elegir desde..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Catastro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Digitalización automática" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11833,13 +11904,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM está detenido para que el cambio surta efecto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12142,43 +12213,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zona" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Zona Lambert" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Cargar localizaciones desde cache (solo si la cache está activada)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Zona Lambert {0} en la caché incompatible con la zona Lambert actual {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Cambiar localización" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Establecer una nueva localización para la nueva solicitud" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Añadir una nueva capa" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Localización" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12188,5 +12265,5 @@ "puntuación conocida por www.cadastre.gouv.fr." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Añadir nueva capa" @@ -12217,5 +12294,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Ajustar WMS" @@ -12245,5 +12322,5 @@ "Seleccione primero una de ellas y reinténtelo" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12251,28 +12328,28 @@ msgstr "Capa vacía" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Capa WMS ({0}), {1} tesela(s) cargada" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "No está vectorizado." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "Tamaño de la imagen raster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Está vectorizado." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Cuadro de la Comunna: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12283,25 +12360,16 @@ "Creado uno nuevo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Error en el formato caché" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Error en la zona Lambert de la caché" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -12827,5 +12895,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46 msgid "Line simplification accuracy (degrees)" -msgstr "Precisión de simplificación de línea (grados)" +msgstr "Precisión en la simplificación de línea (grados)" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48 @@ -12895,5 +12963,5 @@ "
Lower values give more nodes, and more accurate lines. Default 0.0003." msgstr "" -"Precisión en la simplificación de linea Douglas-Peucker, medido en grados. " +"Precisión en la simplificación de línea Douglas-Peucker, medido en grados. " "
Con valores más bajos se dan más nodos y las líneas son más precisa. " "0,0003 por defecto." @@ -13366,20 +13434,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "¿Desea permitir esto?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "confirmar la acción del control remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "El control remoto ha pedido importar datos de la siguiente URL:" @@ -13501,13 +13569,9 @@ msgstr "Reducir zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "Ajustar al tamaño de la tesela" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Alinear caché de teselas" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "imagen " @@ -14099,6 +14163,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Línea de costa desordenada" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14208,5 +14273,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43 msgid "Overlapping ways." -msgstr "Viales superpuestos." +msgstr "Vías superpuestas." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44 @@ -14232,5 +14297,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122 msgid "Overlapping ways (with area)" -msgstr "Viales superpuestos (con área)" +msgstr "Vías superpuestas (con área)" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128 @@ -14244,5 +14309,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138 msgid "Overlapping ways" -msgstr "Viales superpuestos" +msgstr "Vías superpuestas" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:21 @@ -14773,12 +14838,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Descargar" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Descargar datos del mapa del servidor OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14794,8 +14857,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"No hay capas de capa fuente
\"{0}\"
podría ser unida a." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14817,7 +14879,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Eliminando nodos duplicados..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14883,29 +14944,29 @@ msgstr "URL o id de WMS no válida" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Ajustar la posición de la capa WMS seleccionada" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Por favor, selecciona la capa WMS a ajustar." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Seleccionar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Inicio de ajuste" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "No existe alctualmente ningua capa WMS que ajustar." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "Ninguna capa que ajustar" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14914,5 +14975,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14922,10 +14983,10 @@ "comprueba la configuración de tus preferencias." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "Atención: La URL completa es ''{0}''." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14941,5 +15002,5 @@ msgstr "Descarga automática" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -14948,19 +15009,19 @@ "''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(desactivado)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Capa WMS ({0}), descargando en zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14975,13 +15036,13 @@ "descargar las teselas WMS de todos modos?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Sí, descargar las imágenes" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "¿URL no válida?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14990,44 +15051,49 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Salvar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Cargar capa WMS desde archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Cargar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Error en el formato del archivo" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Marcadores" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -16224,5 +16290,5 @@ #: build/trans_presets.java:677 build/trans_presets.java:1320 msgid "ground" -msgstr "suelo" +msgstr "tierra" #. item "Highways/Streets/Residential" text "Width (meters)" @@ -21534,5 +21600,5 @@ #: build/trans_presets.java:2423 msgid "line" -msgstr "línea" +msgstr "alta tensión" #: build/trans_presets.java:2423 @@ -22883,5 +22949,5 @@ #: build/trans_presets.java:3069 msgid "Graveyard" -msgstr "Cementario" +msgstr "Camposanto (para los cementerios próximos a las iglesias)" #. item "Land use/Graveyard" @@ -22889,5 +22955,5 @@ #: build/trans_presets.java:3071 msgid "Edit Graveyard" -msgstr "Editar cementerio" +msgstr "Editar camposanto" #: build/trans_presets.java:3077 @@ -27415,8 +27481,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "combinación de etiquetas inusual" @@ -27436,34 +27501,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE Maps" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Maps (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Satélite" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27473,9 +27527,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Calles NRW Geofabrik.de de Renania del Norte-Westfalia" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27489,56 +27546,136 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "No se puede buscar porque no hay datos cargados." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "No existe una primitiva con la versión {0} en este historial" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "ninguna versión más antigua encontrada. El histórico está vacío." - -#~ msgid "No latest version found. History is empty." +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Archivo caché de la zona Lambert 2 (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Archivo caché de la zona Lambert 3 (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Archivo caché de la zona Lambert 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Archivo caché de la zona Lambert 2 (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Archivo caché de la zona Lambert 3 (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Archivo caché de la zona Lambert 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Archivo caché de la zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Archivo caché de la zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Archivo caché de la zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Archivo caché de la zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Archivo caché de la zona Lambert 1 (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." #~ msgstr "" -#~ "no se encontró ninguna versión más reciente. El histórico está vacío." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "" -#~ "No se encontró ninguna primitiva con ID {0} en este conjunto de datos" - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "" -#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este " -#~ "conjunto de datos" - -#~ msgid "Select a starting node on the end of a way" -#~ msgstr "Seleccione un nodo de inicio en el extremo de la vía" - -#~ msgid "Reached the end of the line" -#~ msgstr "Extender al final de la línea" - -#~ msgid "Reached a junction" -#~ msgstr "Alcanzar una intersección" - -#~ msgid "help" -#~ msgstr "ayuda" - -#~ msgid "Help / About" -#~ msgstr "Ayuda / Acerca de..." - -#~ msgid "WMS Plugin Help" -#~ msgstr "Ayuda del componente WMS" +#~ "IMPORTANTE: los datos están posicionados\n" +#~ "lejos de los límites de la Zona Lambert.\n" +#~ "No suba ningún dato después de este mensaje.\n" +#~ "Deshaga su última acción, guarde su trabajo\n" +#~ "y cree una nueva capa en otra zona." + +#~ msgid "Edit Properties" +#~ msgstr "Editar propiedades" + +#~ msgid "Linked" +#~ msgstr "Vinculado" + +#~ msgid "Zone" +#~ msgstr "Zona" + +#~ msgid "Snap to tile size" +#~ msgstr "Ajustar al tamaño de la tesela" #~ msgid "Move" @@ -27827,4 +27964,13 @@ #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "Help / About" +#~ msgstr "Ayuda / Acerca de..." + +#~ msgid "help" +#~ msgstr "ayuda" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Ayuda del componente WMS" #~ msgid "Adjust the position of the WMS layer" @@ -28121,9 +28267,4 @@ #~ "coincidirlos.\"" -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Zona Lambert {0} en la caché incompatible con la zona Lambert actual {1}" - #~ msgid "sports" #~ msgstr "Deportes" @@ -28303,4 +28444,7 @@ #~ msgstr "Primitiva ya eliminada" +#~ msgid "Reached the end of the line" +#~ msgstr "Extender al final de la línea" + #~ msgid "Apply partial resolutions" #~ msgstr "Aplicar resolución parcial" @@ -28372,4 +28516,10 @@ #~ msgstr "Validar la selección actual o el conjunto de datos completado" +#~ msgid "Select a starting node on the end of a way" +#~ msgstr "Seleccione un nodo de inicio en el extremo de la vía" + +#~ msgid "Reached a junction" +#~ msgstr "Alcanzar una intersección" + #~ msgid "WGS84 Geographisch" #~ msgstr "WGS84 Geográfico" @@ -28389,4 +28539,9 @@ #~ msgid "removing reference from way {0}" #~ msgstr "eliminando referencia de la vía {0}" + +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "" +#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este " +#~ "conjunto de datos" #~ msgid "No data" @@ -28419,4 +28574,7 @@ #~ "ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez " #~ "{0} de {1} solo seleccionados primitivos" + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "No se puede buscar porque no hay datos cargados." #~ msgid "" @@ -28463,4 +28621,8 @@ #~ "\"{1}\">su idioma." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "" +#~ "No se encontró ninguna primitiva con ID {0} en este conjunto de datos" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Página de ayuda perdida. Crearla en English." @@ -28476,4 +28638,17 @@ #~ msgstr "Retorno de valor inexperado. Obtenido {0}" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "No existe una primitiva con la versión {0} en este historial" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "ninguna versión más antigua encontrada. El histórico está vacío." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "" +#~ "no se encontró ninguna versión más reciente. El histórico está vacío." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "índice fuera de los límites. Obtenido {0}" Index: applications/editors/josm/i18n/po/et.po =================================================================== --- applications/editors/josm/i18n/po/et.po (revision 18772) +++ applications/editors/josm/i18n/po/et.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:37+0000\n" -"Last-Translator: lyyser \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-20 16:51+0000\n" +"Last-Translator: Margus Värton \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Abi" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoreerin vigast URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Hoiatus" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoreerin vigast faili URL''i: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Viga" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -302,5 +303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -309,27 +310,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -347,5 +348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Loobu" @@ -355,19 +356,19 @@ msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Palun vali sihtkiht." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Vali sihtkiht" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Ühenda" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -376,5 +377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Sihtkihte ei ole" @@ -487,13 +488,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -576,5 +577,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33 msgid "Close open changesets" -msgstr "" +msgstr "Sule avatud muutustekogumid" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35 @@ -591,23 +592,23 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Fail: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." -msgstr "" +msgstr "Laen avatud muutustekogumeid alla ..." #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 @@ -642,10 +643,10 @@ msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Ühenda {0} teed." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Palun vali vähemalt kaks teed, mida sobitada." @@ -689,10 +690,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -711,11 +712,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Ülekirjutamine" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Fail eksisteerib! Kas kirjutada see üle?" @@ -735,5 +736,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 msgid "Download from OSM..." -msgstr "Lae OSM serverist..." +msgstr "Lae andmed alla..." #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32 @@ -762,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -769,6 +770,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -784,7 +785,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -812,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Kahekordista" @@ -834,30 +834,30 @@ msgstr "Rakenduse sulgemine." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Kõik formaadid" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Ekspordi GPX-i..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Ekspordi andmed GPX faili." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Midagi ei ole eksportida." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -865,13 +865,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -890,8 +890,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -899,7 +899,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -922,9 +922,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -936,5 +936,5 @@ msgstr "parameeter ''{0}'' ei tohi olla null" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -942,5 +942,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Ekspordi GPX fail" @@ -1086,6 +1086,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Uus" @@ -1128,5 +1128,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70 msgid "Select if the data should be downloaded in a new layer" -msgstr "" +msgstr "Vali, kas andmed tuleb alla laadida uude kihti" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77 @@ -1136,5 +1136,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79 msgid "Enter an URL from where data should be downloaded" -msgstr "" +msgstr "Sisesta URL kust tuleb andmeid alla laadida" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88 @@ -1148,13 +1148,13 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94 msgid "Start downloading data" -msgstr "" +msgstr "Käivita andmete allalaadimine" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95 msgid "Close dialog and cancel downloading" -msgstr "" +msgstr "Sule dialoogiaken ja katkesta allalaadimine" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" +msgstr "Andmete allalaadimine" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 @@ -1214,5 +1214,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Kleebi" @@ -1300,11 +1300,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Salvesta" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Salvesta praegused andmed" @@ -1361,10 +1361,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Salvesta nimega..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Salvesta need andmed uude faili." @@ -1382,29 +1382,29 @@ "Vali kõik kustutamata objektid sellel kihil. Poolikud objektid valitakse ka." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Näita staatust" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "Näita kasuliku infoga staatust, mis ei ole seotud programmivigadega." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Abi: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Staatus" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopeeri puhvrisse ja sulge." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1502,5 +1502,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" -msgstr "Kleebi tee uuesti kokku." +msgstr "Võta teed liimist lahti" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 @@ -1522,5 +1522,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 msgid "The current selection cannot be used for unglueing." -msgstr "Seda valikut ei ole võimalik uuestiliitmiseks kasutada." +msgstr "Praegust valikut ei saa liimist lahtivõtmiseks kasutada." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 @@ -1570,5 +1570,5 @@ msgstr "Lahtisulatatud sõlm" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1576,5 +1576,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1612,5 +1612,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 msgid "Update data" -msgstr "" +msgstr "Värskenda andmed" #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 @@ -1621,55 +1621,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +msgstr "Andmete allalaadimine" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" msgstr "Uuenda valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Uuenda valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Ei ole valitud primitiive mida uuendada." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Tühi valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Uuenda valik" - +msgstr "Uuenda objektid" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +msgstr "Lae andmed üles" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1678,5 +1675,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1684,29 +1681,29 @@ msgstr "Pole muudatusi mida üles laadida." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Sünkroniseeri kogu andmekogu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1720,11 +1717,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1735,5 +1732,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1743,22 +1740,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1769,19 +1766,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Primitiivi uuendamine" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1790,5 +1787,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1797,15 +1794,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1917,17 +1914,17 @@ msgstr "Aeglasemalt edasi" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "GPS andmete allalaadimine" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Alla laetud GPX andmed" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" -msgstr "Andmete allalaadimine" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +msgstr "Laen andmeid alla" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1935,5 +1932,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1987,11 +1984,11 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" -msgstr "Viga allaladimise ajal" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +msgstr "Viga allalaadimisel" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" -msgstr "" +msgstr "Viga allalaadimisel" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 @@ -2007,5 +2004,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2013,5 +2010,5 @@ msgstr "Režiim: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2106,8 +2103,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." msgstr "" -"Joonista soovitud suurusega ristkülik ning vabasta seejärel hiire nupp." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2130,5 +2125,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2148,17 +2143,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2168,22 +2163,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Pööramise lõpetamiseks vabasta hiire nupp." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2191,15 +2186,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Mastaap" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Suumi ja liiguta kaarti" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2207,10 +2202,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Otsi..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2219,58 +2214,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Palun sisesta otsingu tekst" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regulaaravaldis" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "asenda valik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "lisa valikusse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "eemalda valikust" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "tõstutundlik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regulaaravaldis" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2278,34 +2272,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2313,43 +2307,43 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "modified - all changed objects" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2359,51 +2353,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Otsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Alusta otsingut" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Leitud {0} vastet" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" @@ -2417,40 +2411,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2459,9 +2453,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2470,5 +2464,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2566,7 +2560,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2676,5 +2670,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2699,5 +2693,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2705,6 +2699,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2771,17 +2765,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2815,10 +2799,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2851,20 +2835,20 @@ msgstr "Jada" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2886,10 +2870,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2931,5 +2915,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "" @@ -2985,10 +2969,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -2997,5 +2981,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3004,5 +2988,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3011,5 +2995,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3018,5 +3002,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3024,5 +3008,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3031,5 +3015,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3038,5 +3022,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3045,5 +3029,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3052,10 +3036,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3136,25 +3120,25 @@ #. short symbol for South +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +msgid "S" +msgstr "" + +#. short symbol for North #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 -msgid "S" -msgstr "" - -#. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 msgid "N" msgstr "" #. short symbol for West +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 +msgid "W" +msgstr "" + +#. short symbol for East #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 -msgid "W" -msgstr "" - -#. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 msgid "E" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3162,5 +3146,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3168,5 +3152,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3176,26 +3160,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3204,5 +3188,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3265,24 +3249,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3290,5 +3274,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3316,10 +3300,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3330,7 +3314,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "parameeter ''{0}'' ei tohi olla null" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3484,10 +3468,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3499,6 +3483,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3508,5 +3492,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3516,6 +3500,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3533,6 +3517,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "taust" @@ -3550,19 +3534,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3576,26 +3576,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3610,10 +3635,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Rohkem ei näidata" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3621,32 +3646,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3655,5 +3680,5 @@ msgstr[1] "{0} punkti" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3691,6 +3716,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Vastuolu" @@ -3700,11 +3725,11 @@ msgstr "Tundmatu host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3906,11 +3931,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4025,5 +4050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4031,18 +4056,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "kiht ei ole nimekirjas" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4163,67 +4188,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Liikmed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4231,68 +4256,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4300,5 +4325,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4306,30 +4331,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4337,5 +4362,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4343,14 +4368,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4358,5 +4383,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4364,54 +4389,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Eemalda" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4420,5 +4445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4427,5 +4452,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4434,5 +4459,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4441,5 +4466,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4448,6 +4473,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4456,6 +4481,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4466,5 +4491,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4476,5 +4501,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4483,19 +4508,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4504,9 +4529,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4516,5 +4541,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4538,84 +4563,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4625,17 +4650,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4644,9 +4669,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4661,19 +4686,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4689,10 +4714,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4702,10 +4727,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4732,27 +4757,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4777,22 +4802,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4800,5 +4825,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4889,6 +4914,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4899,5 +4924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4911,21 +4936,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4933,5 +4958,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5018,10 +5043,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5041,17 +5066,17 @@ msgstr "Käsujada: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Lahenda" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5061,25 +5086,25 @@ "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5091,13 +5116,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5109,8 +5134,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5177,5 +5202,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5207,34 +5232,34 @@ msgstr "Ava kõikide laetud kihtide nimekiri." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Kustuta valitud kiht" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Näita/Peida" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Muuda valitud kihi nähtavust." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Liiguta valitud kiht ühe rea võrra üles." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Liiguta valitud kiht ühe rea võrra alla." @@ -5244,18 +5269,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "See muudab kuni {0} objekti." -msgstr[1] "See muudab kuni {0} objekti." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Tühi väärtus kustutab võtme." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5264,10 +5288,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Muuta väärtusi?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5276,5 +5300,5 @@ msgstr[1] "Muuda kuni {0} objekti seadeid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5283,9 +5307,9 @@ msgstr[1] "See muudab kuni {0} objekti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Palun vali võti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Palun vali väärtus" @@ -5309,102 +5333,98 @@ msgstr "On liikmeks järgnevas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Lisa seaded" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Seaded: {0} / Liikmelisus: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Seaded / Liikmelisus" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Muuda seost" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Tõesti soovid kustutada valikut seosest {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Kustuta valitud võti kõkides objektides" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Kustuda seadeid" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Seadete muutmine" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Muuda kõikide valitud objektide võtme väärtust" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Seaded: {0} / Liikmelisus: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Seaded / Liikmelisus" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Muuda seost" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Tõesti soovid kustutada valikut seosest {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Kustuta valitud võti kõkides objektides" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Kustuda seadeid" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Seosed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Ava kõikide seoste nimekiri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Seosed: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Ava toimetajas valitud seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Kustuta valitud seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Loo uus seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5433,5 +5453,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5443,9 +5463,9 @@ msgstr "Valik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Lase paneel vabaks" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5453,5 +5473,5 @@ "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" @@ -5532,12 +5552,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Konfliktid andmetes" @@ -5555,5 +5575,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5561,5 +5581,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5567,18 +5587,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5587,14 +5607,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5604,9 +5624,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5616,15 +5636,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5632,5 +5652,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5638,20 +5658,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5660,66 +5680,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Liiguta hetkel valitud liiget ülespoole" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Liiguta hetkel valitud liiget allapoole" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5728,9 +5748,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5739,41 +5759,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +msgstr "Rakenda jooksvad uuendused" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5783,19 +5803,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Laen andmeid alla" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5816,10 +5843,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5833,5 +5856,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5901,9 +5924,9 @@ msgstr "Järjehoidjad" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5912,52 +5935,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5966,52 +5989,52 @@ "URL lehelt www.openstreetmap.org (saad kleepida siia allalaetava ala URL''i)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Ümbritsev kast" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Andme allikad ja tüübid" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Openstreetmapi andmed" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Toored GPS andmed" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Lae alla uue kihina" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6019,38 +6042,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Allalaetav ala" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Lae alla" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Allalaetav ala liiga suur; server arvatavasti keeldub" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Allalaetav ala paras, suurus serverile tõenäoliselt sobiv" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6072,21 +6095,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer exception, arvatavasti mõned puuduvad sildid (tag)." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6825,8 +6848,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -6999,5 +7022,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7009,5 +7032,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7054,5 +7077,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7066,5 +7089,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7075,5 +7098,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7082,19 +7105,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7104,32 +7127,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7151,5 +7174,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7211,7 +7234,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parameeter ''{0}'' ei tohi olla null" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7241,33 +7264,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Suumi {0}" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Ajalugu" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7293,7 +7314,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7360,12 +7380,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versioon {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "valitud" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7423,10 +7442,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7637,5 +7656,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7658,17 +7677,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7684,7 +7703,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7727,29 +7746,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Lae muudatused üles" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7759,38 +7778,38 @@ "muudetud primitiivi kohta eraldi päringu kasutamiseks" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +msgstr "Lae andmed juba avatud muutustekogumisse" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7798,16 +7817,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7851,24 +7870,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7876,33 +7895,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 +#, java-format +msgid "GPS start: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 +#, java-format +msgid "GPS end: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format -msgid "GPS start: {0}" +msgid "current delta: {0}s" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -#, java-format -msgid "GPS end: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 -#, java-format -msgid "current delta: {0}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 msgid "timezone difference: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7911,14 +7930,14 @@ msgstr[1] "pildid" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Sünkroniseeri kell" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7926,32 +7945,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Pilt" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 +msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "" @@ -8041,5 +8060,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8091,10 +8110,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Muuda andme kihiks" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8104,11 +8123,11 @@ "kahjulikuks.
Kui soovite üles laadida radasid, vaata siia:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8118,29 +8137,29 @@ msgstr "Muudetud sellest: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8149,9 +8168,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8159,5 +8178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8165,23 +8184,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Andmekiht {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8190,5 +8209,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8202,5 +8221,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8213,11 +8232,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8226,21 +8245,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" msgstr "" @@ -8336,9 +8367,9 @@ msgstr "Pole heli markerit millest nihutada." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Näita/Peida Tekst/Ikoonid" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Muuda markertekstide ja ikoonide nähtavust." @@ -8402,5 +8433,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8408,5 +8439,5 @@ msgstr "PAlun vali rida muutmiseks" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8414,5 +8445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8421,5 +8452,5 @@ msgstr "Palun vali rida kustutamiseks" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "" @@ -8542,40 +8573,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Värv" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Vali" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Värvid" @@ -9006,17 +9037,17 @@ msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projektsiooni meetodid" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9026,5 +9057,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9082,81 +9113,81 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9165,6 +9196,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9330,10 +9361,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9343,13 +9374,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9357,18 +9388,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Valikulised tunnused:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "suletud tee" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Tundmatu tüüp: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9379,15 +9410,15 @@ msgstr "Ei saa lugeda sildistamise eelseadeid: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Viga sõelumisel {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente tüübist {0} toetatakse." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9397,18 +9428,18 @@ msgstr[1] "Muuda {0} objekti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Midagi pole valitud!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Muuda seadeid" @@ -9424,6 +9455,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9432,8 +9463,21 @@ msgstr "Ühendun OSM serveriga..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Laen alla punkte alates {0} kuni {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9548,11 +9592,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9562,40 +9606,40 @@ msgstr "Laen alla OSM andmeid..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9658,5 +9702,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9669,66 +9713,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Sulgen muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Ettevalmistus..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Üleslaadimine..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9763,5 +9807,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9788,5 +9832,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9794,5 +9838,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9805,5 +9849,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9954,5 +9998,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9961,38 +10005,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10000,19 +10044,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Puudulik määratlus ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Keelatud objekti number id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10022,10 +10066,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10035,25 +10077,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10507,5 +10549,5 @@ msgstr "(Tekst on juba kopeeritud clipboardi.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10514,12 +10556,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10529,5 +10564,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10537,10 +10572,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10549,5 +10579,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10556,5 +10586,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10563,9 +10593,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10575,5 +10612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10582,5 +10619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10589,5 +10626,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10596,10 +10633,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10608,10 +10645,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10622,5 +10659,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10630,5 +10667,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11342,5 +11379,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11353,28 +11390,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11404,13 +11458,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11419,13 +11473,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11705,43 +11759,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11749,5 +11808,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11778,5 +11837,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11804,34 +11863,34 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 msgid "Blank Layer" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +msgstr "Tühi kiht" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11840,24 +11899,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12883,20 +12933,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13018,13 +13068,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13596,5 +13642,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +msgid "Unconnected coastline" msgstr "" @@ -14236,12 +14282,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Lae alla" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Lae kaardi andmed OSM serverist" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14279,7 +14323,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Sulanda {0} sõlm(e)" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14345,29 +14388,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14376,5 +14419,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14382,10 +14425,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14398,24 +14441,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14426,57 +14469,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Järjehoidjad" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -14486,5 +14534,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 msgid "Open a blank WMS layer to load data from a file" -msgstr "" +msgstr "Ava tühi WMS kiht andmete laadimiseks failist" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 @@ -14672,5 +14720,5 @@ #: build/trans_plugins.java:31 msgid "Helps vectorizing WMS images." -msgstr "" +msgstr "Aitab WMS kujutisi vektoriseerida" #. Plugin livegps @@ -26786,8 +26834,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "ebatavaline sildikombinatsioon" @@ -26807,34 +26854,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE Maps" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Maps (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26844,9 +26880,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Tänavad NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26860,16 +26899,76 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" msgstr "" #~ msgid "Upload to OSM..." #~ msgstr "Lae OSMi serverisse" + +#~ msgid "Edit Properties" +#~ msgstr "Seadete muutmine" #~ msgid "Move" Index: applications/editors/josm/i18n/po/fi.po =================================================================== --- applications/editors/josm/i18n/po/fi.po (revision 18772) +++ applications/editors/josm/i18n/po/fi.po (revision 18773) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" "PO-Revision-Date: 2009-11-08 14:30+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Ohje" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Varoitus" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Ei voitu lukea tiedostoa ''{0}''.
Virhe:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Ei voitu lukea tiedostoa ''{0}''.
Virhe:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Virhe" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -304,5 +305,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -311,27 +312,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -349,5 +350,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Peruuta" @@ -357,19 +358,19 @@ msgstr "Valitse ainakin yksi jo lähetetty piste, polku tai relaatio." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Ole hyvä ja valitse kohdetaso" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Valitse kohdetaso" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Yhdistä" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -380,5 +381,5 @@ "tasoista." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Ei kohdetasoja" @@ -491,13 +492,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -595,20 +596,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Tiedosto: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Ei avonaisia muutoskokoelmia" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Ei avonaisia muutoskokoelmia" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -646,10 +647,10 @@ "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Yhdistä {0} polkua" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Valitse ainakin kaksi yhdistettävää polkua." @@ -694,10 +695,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -716,11 +717,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Korvaa" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Tiedosto on jo olemassa. Korvataanko?" @@ -767,5 +768,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -774,6 +775,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -789,7 +790,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -817,5 +817,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Monista" @@ -839,30 +839,30 @@ msgstr "Poistu ohjelmasta." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Kaikki tunnetut muodot" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "GPX-vienti..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Vie data GPX-tiedostoon." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Ei mitään vietävää. Hae ensin dataa." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -870,13 +870,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -895,8 +895,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -904,7 +904,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -927,9 +927,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -941,5 +941,5 @@ msgstr "parametri ''{0}'' ei saa olla tyhjä" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -947,5 +947,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Vie GPX-tiedosto" @@ -1091,6 +1091,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Uusi" @@ -1222,5 +1222,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Liitä" @@ -1308,11 +1308,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Tallenna" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Tallenna tämänhetkinen data." @@ -1369,10 +1369,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Tallenna nimellä..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Tallenna data uuteen tiedostoon." @@ -1391,29 +1391,29 @@ "objektit." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Näytä raportti" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "Näytä tilaraportti virheraportteihin liittäessä hyödyllisin tiedoin." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Ohje: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Raportti" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopioi leikepöydälle ja sulje" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1581,5 +1581,5 @@ msgstr "Irroitettu piste" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1587,5 +1587,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1632,55 +1632,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Päivitä valinnat" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "Päivittää valitut objektit palvelimelta (uudelleenlataa tiedot)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Päivitä valinta" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Päivitettäviä objekteja ei valittuna." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Valinta tyhjä" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Päivitä valinnat" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Lähetä tietoa" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1691,5 +1688,5 @@ "ensin." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1697,29 +1694,29 @@ msgstr "Ei lähetettäviä muutoksia." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Ei mitään lähetettävää. Hae ensin dataa." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synkronoi koko tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1733,11 +1730,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1748,5 +1745,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1756,22 +1753,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Muutoskokoelma suljettu" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1782,19 +1779,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1803,5 +1800,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1810,15 +1807,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1930,17 +1927,17 @@ msgstr "Hitaammin eteenpäin" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Ladataan GPS-dataa" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Ladattu GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Ladataan dataa" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1948,5 +1945,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -2000,9 +1997,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2020,5 +2017,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2026,5 +2023,5 @@ msgstr "Tila: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2122,8 +2119,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." msgstr "" -"Piirrä halutun kokoinen suorakaide, sen jälkeen vapauta hiiren painike." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2133,9 +2128,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Raahaa pisteiden välistä yhteyttä piirtääksesi suorakulmion." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2147,5 +2141,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2165,17 +2159,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Toteuta siirto" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Kumoa siirto" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2185,22 +2179,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2208,15 +2202,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoomaus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zoomaa ja siirrä karttaa" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2226,10 +2220,10 @@ "Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Etsi..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2238,58 +2232,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Anna hakusana." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "säännöllinen lauseke" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "korvaa valinta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "lisää valintaan" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "poista valinnasta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "kirjainkoko merkitsee" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "säännöllinen lauseke" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2297,34 +2290,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2332,43 +2325,43 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "modified - all changed objects" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2378,51 +2371,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Etsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Hakusanalla \"{0}\" ei löytynyt mitään" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Valintaan ei lisätty mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Valinnasta ei poistettu mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Löytyi {0} osumaa" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" @@ -2439,40 +2432,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Päättävä sulkumerkki puuttuu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2481,9 +2474,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2492,5 +2485,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2590,7 +2583,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2700,5 +2693,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2723,5 +2716,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2729,6 +2722,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2798,17 +2791,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2842,10 +2825,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2878,20 +2861,20 @@ msgstr "Komentosarja" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2913,10 +2896,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2960,5 +2943,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Uusi arvo" @@ -3005,7 +2988,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Parametr ''{0}'' ei saa olla \"null\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3014,10 +2997,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3026,5 +3009,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3033,5 +3016,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3040,5 +3023,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3047,5 +3030,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3053,5 +3036,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3060,5 +3043,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3067,5 +3050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3074,5 +3057,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3081,10 +3064,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3165,25 +3148,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "E" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "P" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "L" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "I" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3191,5 +3174,5 @@ msgstr "Muutoskokoelma {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3197,5 +3180,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3205,26 +3188,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3233,5 +3216,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3294,24 +3277,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3319,5 +3302,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3345,10 +3328,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3359,7 +3342,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Parametr ''{0}'' ei saa olla \"null\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3514,10 +3497,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Virhe: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3529,6 +3512,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3538,5 +3521,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3546,6 +3529,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3563,6 +3546,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "tausta" @@ -3580,19 +3563,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3606,26 +3605,51 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3640,10 +3664,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Älä näytä uudelleen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3651,32 +3675,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "keskeneräinen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "tie" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "rata" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vesiväylä" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "maankäyttö" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3685,5 +3709,5 @@ msgstr[1] "{0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3721,6 +3745,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Ristiriita" @@ -3730,11 +3754,11 @@ msgstr "Tuntematon palvelin" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3930,11 +3954,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4049,5 +4073,5 @@ msgstr "Piirrettävän segmentin pituus." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4055,18 +4079,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(ei objektia)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "taso ei ole listassa." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4187,67 +4211,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Tagit" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4255,68 +4279,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4324,5 +4348,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4330,30 +4354,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4361,5 +4385,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4367,14 +4391,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4382,5 +4406,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4388,54 +4412,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Poista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4444,5 +4468,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4451,5 +4475,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4458,5 +4482,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4465,5 +4489,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4472,6 +4496,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4480,6 +4504,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4490,5 +4514,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4500,5 +4524,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4507,19 +4531,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4528,9 +4552,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4540,5 +4564,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4562,84 +4586,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "poistettu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4649,17 +4673,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4668,9 +4692,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4685,19 +4709,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4713,10 +4737,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4726,10 +4750,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4756,27 +4780,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4801,22 +4825,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4824,5 +4848,5 @@ msgstr "ei mitään" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4913,6 +4937,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4923,5 +4947,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4935,21 +4959,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4957,5 +4981,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5043,10 +5067,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5066,17 +5090,17 @@ msgstr "Komentolista: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Selvitä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5085,25 +5109,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5115,13 +5139,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5133,8 +5157,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5201,5 +5225,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5231,34 +5255,34 @@ msgstr "Avaa lista kaikista ladatuista tasoista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Poista valittu taso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Näytä/piilota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Näytä/piilota valittu taso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Siirrä valittu taso rivi ylöspäin." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Siirrä valittu taso rivi alaspäin." @@ -5268,18 +5292,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Olet muuttamassa {0} kohdetta." -msgstr[1] "Olet muuttamassa {0} kohdetta." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Tyhjä arvo poistaa avaimen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5288,10 +5311,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Muutetaanko arvot?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5300,5 +5323,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5307,9 +5330,9 @@ msgstr[1] "Olet muuttamassa {0} kohdetta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Valitse avain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Valitse arvo" @@ -5333,102 +5356,98 @@ msgstr "Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Lisää ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Ominaisuudet / Jäsenyydet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Muuta relaatiota" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Poista relaatiosta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Poistetaanko valinta relaatiosta {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Poista valittu avain kaikista objekteista" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Poista asetukset" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Muokkaa ominaisuuksia" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Ominaisuudet / Jäsenyydet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Muuta relaatiota" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Poista relaatiosta" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Poistetaanko valinta relaatiosta {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Poista valittu avain kaikista objekteista" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Poista asetukset" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Avaa lista kaikista relaatioista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relaatiot: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Avaa valittu relaatio muokkaimeen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Poista valittu relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Luo uusi relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5457,5 +5476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5467,9 +5486,9 @@ msgstr "Valinta: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Irroita paneeli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5478,5 +5497,5 @@ "työkalupalkin napista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" @@ -5557,12 +5576,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5580,5 +5599,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5586,5 +5605,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5592,18 +5611,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5612,14 +5631,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5629,9 +5648,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5641,15 +5660,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5657,5 +5676,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5663,20 +5682,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5685,66 +5704,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Siirrä valittuja jäseniä ylöspäin" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Siirrä valittuja jäseniä alaspäin" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5753,9 +5772,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5764,41 +5783,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Tee muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Tee muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Peruuta muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5808,19 +5827,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Muuta relaatiota {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5841,10 +5867,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5858,5 +5880,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5926,9 +5948,9 @@ msgstr "Kirjanmerkit" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5937,52 +5959,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5992,52 +6014,52 @@ "tähän ladataksesi alueen)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Rajoittava alue" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Datalähteet ja -tyypit" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreeMap-data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Raaka GPS-data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Lataa uutena tasona" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6045,39 +6067,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Lataa alue" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Lataa" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Ladattava alue on liian iso, palvelin todennäköisesti hylkää pyynnön" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" "Ladattava alue on sopivan kokoinen, palvelin todennäköisesti hyväksyy pyynnön" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6099,21 +6121,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6852,8 +6874,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7026,5 +7048,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7036,5 +7058,5 @@ msgstr "Tyyppi" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7081,5 +7103,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7093,5 +7115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7102,5 +7124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7109,19 +7131,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7131,32 +7153,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7178,5 +7200,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7238,7 +7260,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parametri ''{0}'' ei saa olla tyhjä" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7268,33 +7290,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zoomaa ongelmaan" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "historia" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7303,7 +7323,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "koillinen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7321,7 +7340,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7361,7 +7379,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonyymi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7389,12 +7406,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versio {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "poistettu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7452,10 +7468,10 @@ msgstr "Muutoskokoelmaa {0} suljetaan" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7670,5 +7686,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7691,17 +7707,17 @@ msgstr "Taso" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7717,7 +7733,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Uuden muutoskokoelman tagit" @@ -7760,29 +7776,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Lähetä muutokset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Lähetä muutokset" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "Virheellinen kommentti" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Peruuta lähetys ja jatka muokkausta" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Lähetä kaikki muutokset yhtenä pyyntönä" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7790,40 +7806,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Avaa uusi muutoskokoelma" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" "Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Käytä avonaista muutoskokoelmaa" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Lähetä data avonaiseen muutoskokoelmaan" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Sulje muutoskokoelma lähetyksen jälkeen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" "Valitse muutoskokoelman sulkemiseksi seuraavan datan lähetyksen jälkeen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7831,16 +7847,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Lataa lista avonaisista muutoskokoelmista palvelimelta" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Sulje valittuna oleva avoin muutoskokoelma" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7884,24 +7900,24 @@ msgstr "Jatka lähetystä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Lue GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Ei aikaleimaa pisteelle {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7909,33 +7925,33 @@ msgstr "Luetaan {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Ei löytynyt aikaleimallisia kuvia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geo-merkityt kuvat" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 +#, java-format +msgid "GPS start: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 +#, java-format +msgid "GPS end: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format -msgid "GPS start: {0}" +msgid "current delta: {0}s" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -#, java-format -msgid "GPS end: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 -#, java-format -msgid "current delta: {0}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 msgid "timezone difference: " msgstr "aikavyöhyke-ero: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7944,14 +7960,14 @@ msgstr[1] "kuvat" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Tahdista kello" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7959,32 +7975,32 @@ msgstr "JPEG-kuvat (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Kuva" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Tahdista aika GPS-yksikön kanssa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Syötettyä aikaa ei voitu tulkita oikein." @@ -8074,5 +8090,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8124,10 +8140,10 @@ msgstr[1] "{0} reittipistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Muuta datatasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8137,11 +8153,11 @@ "haitallisena.
Jos haluat lähettää jälkiä, katso:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8151,29 +8167,29 @@ msgstr "Muutettu jäljestä {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Lataa kaikki alueella:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Yhden pyynnön enimmäisalue:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} neliökilometriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8182,9 +8198,9 @@ msgstr "Tämä vaatii {0} erillistä latauspyyntöä.
Jatketaanko?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8192,5 +8208,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8198,23 +8214,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datataso {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "ladatun alueen ulkopuolella" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8223,5 +8239,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8235,5 +8251,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8246,11 +8262,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8259,22 +8275,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Muuta GPX-tasoksi" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Ei \"from\"-roolin tietä." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8371,9 +8400,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Näytä/piilota teksti/kuvakkeet" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8435,5 +8464,5 @@ msgstr "Oletusarvo on tuntematon (asetusta ei ole vielä käytetty)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8441,5 +8470,5 @@ msgstr "Ole hyvä ja valitse muokattava rivi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8447,5 +8476,5 @@ msgstr "Uusi arvo {0}:lle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8454,5 +8483,5 @@ msgstr "Ole hyvä ja valitse poistettava rivi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Anna uusi avain/arvo-pari" @@ -8577,40 +8606,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Väri" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Piirtotyyli {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Taso: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Valitse" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Valitse väri {0}:lle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Eri objekteille käytetyt värit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Värit" @@ -9051,17 +9080,17 @@ "käyttöön." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Näytä koordinaatit" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projektiometodi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9071,5 +9100,5 @@ msgstr "Karttaprojektio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9127,81 +9156,81 @@ msgstr "Pikanäppäin" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9210,6 +9239,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9387,10 +9416,10 @@ msgstr "Muuttujaryhmät" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9400,13 +9429,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9414,18 +9443,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Lisäominaisuudet:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Tuntematon tyyppi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9436,15 +9465,15 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Virhe käsiteltäessä {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9454,18 +9483,18 @@ msgstr[1] "Muuta {0} objektia" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ei mitään valittuna!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Valinta ei ole sopiva!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Muuta ominaisuuksia" @@ -9481,6 +9510,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9489,8 +9518,21 @@ msgstr "Yhdistetään OSM-palvelimeen..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Ladataan pisteet {0}-{1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9607,11 +9649,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9621,40 +9663,40 @@ msgstr "Ladataan OSM-karttatietoja..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9717,5 +9759,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9728,66 +9770,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Muutoskokoelmaa luodaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Muutoskokoelma {0} avattiin onnistuneesti" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Muutoskokoelmaa päivitetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Muutoskokoelmaa {0} päivitetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Muutoskokoelmaa suljetaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Lähetetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9822,5 +9864,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9847,5 +9889,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9853,5 +9895,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9864,5 +9906,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10013,5 +10055,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10020,38 +10062,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10059,19 +10101,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Virheellinen objekti (id=0)" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10081,10 +10123,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10094,25 +10134,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10576,5 +10616,5 @@ msgstr "(Teksti on jo kopioitu leikepöydälle)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10583,15 +10623,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" -"Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella " -"''{1}''.
Palvelin sulkee muutoskokoelman automaattisesti aikarajan " -"umpeuduttua" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10601,5 +10631,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10609,10 +10639,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10621,5 +10646,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10628,5 +10653,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10635,9 +10660,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10647,5 +10679,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10654,5 +10686,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10661,5 +10693,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10668,10 +10700,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10680,10 +10712,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10694,5 +10726,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10702,5 +10734,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11423,5 +11455,5 @@ msgstr "Virhe tiedostossa {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11434,28 +11466,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Virhe ladattaessa tiedostoa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11485,13 +11534,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11500,13 +11549,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11786,43 +11835,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11830,5 +11884,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11859,5 +11913,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11885,5 +11939,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11891,28 +11945,28 @@ msgstr "Tyhjä taso" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11921,24 +11975,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12982,20 +13027,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Sallitaanko tämä?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Varmista etähallinnan toimenpide" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13117,13 +13162,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13704,6 +13745,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Yhdistämättömät polut" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14362,12 +14404,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Lataa" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Lataa karttadataa OSM-palvelimelta." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14383,9 +14423,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Valittua tasoa
{0}
ei voi yhdistää mihinkään nykyisistä " -"tasoista." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14407,7 +14445,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Poistetaan pisteiden kaksoiskappaleet..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14473,29 +14510,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14504,5 +14541,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14510,10 +14547,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14526,24 +14563,24 @@ msgstr "Automaattinen lataus" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14554,13 +14591,13 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14569,44 +14606,49 @@ "resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Vaihda resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Tallenna WMS-taso tiedostoon" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Lataa WMS-taso tiedostosta" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Kirjanmerkit" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26918,8 +26960,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "poikkeuksellinen tagiyhdistelmä" @@ -26939,34 +26980,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE-kartat" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26976,9 +27006,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26992,124 +27025,193 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE-kartat" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Edit Properties" +#~ msgstr "Muokkaa ominaisuuksia" + +#~ msgid "" +#~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +#~ "changeset will automatically be closed by the server after a timeout." +#~ msgstr "" +#~ "Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella " +#~ "''{1}''.
Palvelin sulkee muutoskokoelman automaattisesti aikarajan " +#~ "umpeuduttua" + +#~ msgid "Unknown version" +#~ msgstr "Tuntematon versio" + +#~ msgid "Unsaved Changes" +#~ msgstr "Tallentamattomia muutoksia" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lisää valitut objektit jäseniksi" + +#~ msgid "Revert" +#~ msgstr "Palauta" + +#~ msgid "Date" +#~ msgstr "Päivämäärä" + +#~ msgid "Object" +#~ msgstr "Objekti" + +#~ msgid "name" +#~ msgstr "nimi" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." + +#~ msgid "File not found" +#~ msgstr "Tiedostoa ei löytynyt" + +#~ msgid "Open in Browser" +#~ msgstr "Avaa selaimessa" + +#~ msgid "Email" +#~ msgstr "Sähköpostiosoite" + +#~ msgid "Unknown file extension." +#~ msgstr "Tuntematon tiedostopääte." + +#~ msgid "Please enter the desired coordinates first." +#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin." + +#~ msgid "Error parsing server response." +#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." + +#~ msgid "Merging conflicts." +#~ msgstr "Yhdistämisristiriidat" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" + +#~ msgid "my version:" +#~ msgstr "minun versioni:" + +#~ msgid "their version:" +#~ msgstr "palvelimen versio:" + +#~ msgid "Change" +#~ msgstr "Muokkaa" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Poista {1} {0}" + +#~ msgid "Move" +#~ msgstr "Siirrä" + +#~ msgid "position" +#~ msgstr "sijainti" + +#~ msgid "false" +#~ msgstr "epätosi" + +#~ msgid "true" +#~ msgstr "tosi" + +#~ msgid "Conflicting relation" +#~ msgstr "Ristiriidassa oleva relaatio" + +#~ msgid "different" +#~ msgstr "eri" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Error while loading page {0}" +#~ msgstr "Virhe ladattaessa sivua {0}" + +#~ msgid "File could not be found." +#~ msgstr "Tiedostoa ei löytynyt." + +#~ msgid "unnamed" +#~ msgstr "nimetön" + +#~ msgid "Data Layer" +#~ msgstr "Datataso" + +#~ msgid "Please enter a search string" +#~ msgstr "Anna haettava merkkijono" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä" + +#~ msgid "Import TCX File..." +#~ msgstr "Tuo TCX-tiedosto..." + +#~ msgid "zoom" +#~ msgstr "zoom" + +#~ msgid "Validate" +#~ msgstr "Tarkista" #~ msgid "help" #~ msgstr "ohje" - -#~ msgid "Unknown version" -#~ msgstr "Tuntematon versio" - -#~ msgid "Unsaved Changes" -#~ msgstr "Tallentamattomia muutoksia" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Lisää valitut objektit jäseniksi" - -#~ msgid "Revert" -#~ msgstr "Palauta" - -#~ msgid "Date" -#~ msgstr "Päivämäärä" - -#~ msgid "Object" -#~ msgstr "Objekti" - -#~ msgid "name" -#~ msgstr "nimi" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." - -#~ msgid "File not found" -#~ msgstr "Tiedostoa ei löytynyt" - -#~ msgid "Open in Browser" -#~ msgstr "Avaa selaimessa" - -#~ msgid "Email" -#~ msgstr "Sähköpostiosoite" - -#~ msgid "Unknown file extension." -#~ msgstr "Tuntematon tiedostopääte." - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin." - -#~ msgid "Error parsing server response." -#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." - -#~ msgid "Merging conflicts." -#~ msgstr "Yhdistämisristiriidat" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" - -#~ msgid "my version:" -#~ msgstr "minun versioni:" - -#~ msgid "their version:" -#~ msgstr "palvelimen versio:" - -#~ msgid "Change" -#~ msgstr "Muokkaa" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Poista {1} {0}" - -#~ msgid "Move" -#~ msgstr "Siirrä" - -#~ msgid "position" -#~ msgstr "sijainti" - -#~ msgid "false" -#~ msgstr "epätosi" - -#~ msgid "true" -#~ msgstr "tosi" - -#~ msgid "Conflicting relation" -#~ msgstr "Ristiriidassa oleva relaatio" - -#~ msgid "different" -#~ msgstr "eri" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Error while loading page {0}" -#~ msgstr "Virhe ladattaessa sivua {0}" - -#~ msgid "File could not be found." -#~ msgstr "Tiedostoa ei löytynyt." - -#~ msgid "unnamed" -#~ msgstr "nimetön" - -#~ msgid "Data Layer" -#~ msgstr "Datataso" - -#~ msgid "Please enter a search string" -#~ msgstr "Anna haettava merkkijono" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä" - -#~ msgid "Import TCX File..." -#~ msgstr "Tuo TCX-tiedosto..." - -#~ msgid "zoom" -#~ msgstr "zoom" - -#~ msgid "Validate" -#~ msgstr "Tarkista" #~ msgid "Only two nodes allowed" Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 18772) +++ applications/editors/josm/i18n/po/fr.po (revision 18773) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-15 20:47+0000\n" -"Last-Translator: David Perrenoud \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-18 17:32+0000\n" +"Last-Translator: François Blondel \n" "Language-Team: Fr <>\n" "MIME-Version: 1.0\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -26,20 +26,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Aide" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "URL mal-formée ignoré : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -60,21 +60,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -82,6 +80,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -93,12 +91,23 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Avertissement" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "URL malformée ignorée dans le fichier : \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"Impossible de lire le fichier ''{0}''.
L’erreur est :
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -106,19 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"Impossible de lire le fichier ''{0}''.
L’erreur est :
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Erreur" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -312,5 +313,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -319,27 +320,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -357,5 +358,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Annuler" @@ -366,19 +367,19 @@ "Veuillez sélectionner au moins un nœud, chemin ou relation déjà chargé." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Veuillez sélectionner le calque de destination." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Sélectionnez le calque de destination" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Fusionner" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -389,5 +390,5 @@ "puisse être fusionné." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Pas de calque de destination" @@ -500,13 +501,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -604,20 +605,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Fichier : {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Il n'y a pas d'ensembles de changements ouverts" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Pas d'ensembles de changements ouverts" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -657,10 +658,10 @@ "une seule chaîne de nœuds)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Fusionner {0} voies" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Veuillez sélectionner au moins deux chemins à fusionner." @@ -706,10 +707,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -728,11 +729,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Écrire dessus" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Le fichier existe déjà. Écrire dessus ?" @@ -781,5 +782,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -788,6 +789,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -803,7 +804,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -831,5 +831,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Dupliquer" @@ -853,30 +853,30 @@ msgstr "Quitter l’application." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Tous les formats" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exporter en GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exporter les données vers un fichier GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Rien à exporter. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -884,13 +884,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -909,8 +909,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -918,7 +918,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -941,9 +941,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -955,5 +955,5 @@ msgstr "le paramètre \"{0}\" ne doit pas être vide" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -961,5 +961,5 @@ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exporter en fichier GPX" @@ -1034,4 +1034,6 @@ "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." msgstr "" +"Impossible de fusionner les nœuds : il faudrait supprimer le chemin ''{0}', " +"qui est encore utilisé." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 @@ -1105,6 +1107,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nouveau" @@ -1241,5 +1243,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Coller" @@ -1328,11 +1330,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Sauvegarder" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Sauvegarder les données actuelles." @@ -1389,10 +1391,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Enregistrer sous…" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Sauvegarder les données actuelles dans un nouveau fichier." @@ -1411,10 +1413,10 @@ "sélectionne aussi les objets incomplets." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Afficher le rapport de statut" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1422,20 +1424,20 @@ "attachées aux bogues." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Aide : {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Rapport d'état" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Copier vers le presse-papier et fermer" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1604,5 +1606,5 @@ msgstr "Nœud séparé" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1610,5 +1612,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1655,13 +1657,13 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Télécharger les données." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Pas de jeu de données courant trouvé" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" @@ -1670,10 +1672,9 @@ "courant" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Actualiser les éléments sélectionnés" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Mettre à jour la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1682,28 +1683,26 @@ "les données)." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Mettre à jour la sélection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "La sélection est vide" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Actualiser les éléments sélectionnés" - +msgstr "Mettre à jour les objets" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Envoyer les données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" @@ -1711,5 +1710,5 @@ "OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1720,5 +1719,5 @@ "les résoudre d'abord." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1726,29 +1725,29 @@ msgstr "Aucun changement à envoyer." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Rien à envoyer. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Synchroniser seulement les noeuds {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Synchroniser seulement les chemins {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Synchroniser seulement les relations {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synchroniser tout le jeu de données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1770,11 +1769,11 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Conflits détectés" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1790,5 +1789,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1801,22 +1800,22 @@ "nouveau avec un nouveau changeset ou avec un changeset existant." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Ensemble de changement fermé" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "Prépare la résolution de conflits" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "Cliquer pour télécharger tous les ways parents du nœud {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "Cliquer pour annuler et reprendre l'édition de la carte" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1827,19 +1826,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "Le nœud est encore utilisé" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Mise à jour des primitives" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1848,5 +1847,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1855,15 +1854,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +msgstr "Envoi de {0} objets…" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1976,17 +1975,17 @@ msgstr "Avancer plus lentement" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Téléchargement des données GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Données GPX téléchargées" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Téléchargement des données" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1996,5 +1995,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "Pas de donnée trouvée dans cette zone." @@ -2011,5 +2010,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157 msgid "Check on the server" -msgstr "" +msgstr "Vérifier sur le serveur" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159 @@ -2018,4 +2017,6 @@ "server" msgstr "" +"Cliquer pour vérifier si il y a des objets dans vos données locales qui " +"sont supprimée sur le serveur." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163 @@ -2026,5 +2027,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165 msgid "Click to abort and to resume editing" -msgstr "" +msgstr "Cliquer pour annuler et reprendre l'édition" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170 @@ -2052,13 +2053,14 @@ msgid "The following errors occurred during mass download: {0}" msgstr "" +"Les erreurs suivantes ont eu lieu lors du téléchargement en masse : {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Erreurs durant le téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" -msgstr "" +msgstr "Erreurs lors du téléchargement." #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 @@ -2074,5 +2076,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2080,5 +2082,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2176,22 +2178,18 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 +msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Dessiner un rectangle de la taille souhaitée puis relacher le bouton de " "souris." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Dessiner un rectangle de la taille souhaitée puis relacher le bouton de " -"souris." - #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Déplacer un segment du chemin pour faire un rectangle." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2206,5 +2204,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2224,17 +2222,17 @@ msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Déplacer des éléments" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Les déplacer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Annuler déplacer" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2247,14 +2245,14 @@ "Confirmez-vous ce déplacement massif ?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" "Relacher le bouton de souris pour sélectionner les objets dans le rectangle." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2263,9 +2261,9 @@ "fusionner avec le nœud le plus proche." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Relacher le bouton de souris pour arrêter la rotation." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2276,15 +2274,15 @@ "sélection" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zoomer et déplacer la carte" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2295,10 +2293,10 @@ "droit de la souris" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Recherche..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2307,60 +2305,59 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Veuillez entrer une chaine de caractère comme filtre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Entrer le texte à rechercher." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "expression régulière" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "Entrer l'expression à rechercher." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "remplacer la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "ajouter à la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "supprimer de la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "trouver dans une selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "respecter la casse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "expression régulière" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Baker Street - 'Baker' et 'Street' dans n'importe quelle clé ou nom." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' et 'Street' dans n'importe quelle clé ou nom." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' n'importe où dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - clé 'type' avec la valeur exacte 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2370,35 +2367,35 @@ "*=valeur, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - pas 'Bak' dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot avec n'importe quelle valeur." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Options spéciales :" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - type de l'objet (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - type de l'objet (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - tous les objets modifiés par l'utilisateur" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id :... - objet avec l'ID indiqué (0 pour les nouveaux objets)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objet avec le nombre de nœuds spécifié" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2406,21 +2403,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - tous les objets modifiés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - tous les objets sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - tous les objets incomplets" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - tous les objets non étiquetés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" @@ -2429,5 +2426,5 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" @@ -2436,18 +2433,18 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "Utilisez | ou OR pour combiner avec le OU logique" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Utilisez \" pour citer des opérateurs (i.e. si la clé contient :)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Utilisez \" pour citer des opérateurs (i.e. si la clé contient :)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "Utilisez ( et ) pour grouper des expressions" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2457,51 +2454,52 @@ msgstr "Filtrez" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Chercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "appliquer le filtre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Commencer la recherche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Aucun résultat trouvé pour \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +"Aucun résultat lors de la recherche dans la sélection en cherchant ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "{0} résultats trouvés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2519,5 +2517,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2525,10 +2523,10 @@ "d'utilisation : clé=valeur" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est illégal !" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2537,26 +2535,26 @@ "relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Jeton inattendu : {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Arguments manquants pour le OU" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Arguments manquants pour le -" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Les parenthèses doivent être fermées." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2565,9 +2563,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2579,5 +2577,5 @@ "10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2686,7 +2684,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2796,5 +2794,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Double conflit" @@ -2821,5 +2819,5 @@ "plus présente" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2827,6 +2825,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "impossible de résoudre un conflit non arbitré" @@ -2836,5 +2834,5 @@ #, java-format msgid "Parameter ''{0}'' must not be empty" -msgstr "" +msgstr "Le paramètre ''{0}'' ne doit pas être vide." #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60 @@ -2896,18 +2894,8 @@ msgstr "Confirmation de suppression" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Résoudre les conflits de suppression dans {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2942,10 +2930,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Résoudre les conflits de la liste des membres de la relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2980,20 +2968,20 @@ msgstr "Séquence" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Résoudre {0} conflits de tag pour le nœud {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Résoudre {0} conflits de tag pour le chemin {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Résoudre {0} conflits de tag pour la relation {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -3015,10 +3003,10 @@ msgstr "Résoudre les conflits de version pour la relation {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3062,5 +3050,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nouvelle valeur" @@ -3107,7 +3095,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3116,10 +3104,10 @@ msgstr "Attention : impossible de forcer les préférences pour ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Erreur dans le fichier de configuration aux lignes {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3128,5 +3116,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3135,5 +3123,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3142,5 +3130,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3149,5 +3137,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3157,5 +3145,5 @@ "préférences par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3166,5 +3154,5 @@ "fichier par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3173,5 +3161,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3183,5 +3171,5 @@ "préférences par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3190,10 +3178,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3274,25 +3262,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3300,5 +3288,5 @@ msgstr "Ensemble de changements {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3306,5 +3294,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3314,26 +3302,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Arguments manquants pour le -" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "Historique de la relation {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3342,6 +3330,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3349,7 +3337,4 @@ "Keeping target object. " msgstr "" -"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive " -"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette " -"contradiction. Je conserve ma primitive. " #. translators notes must be in front @@ -3406,24 +3391,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3431,5 +3416,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3457,10 +3442,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3471,7 +3456,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3490,7 +3475,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3628,10 +3613,10 @@ msgstr "zone de texte" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Erreur : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3643,6 +3628,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3652,5 +3637,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3660,6 +3645,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3677,6 +3662,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "arrière-plan" @@ -3694,24 +3679,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"IMPORTANT : données positionnées trop loin\n" -"de la zone de Lambert actuelle.\n" -"Ne plus charger de données après ce message.\n" -"Annulez votre dernière action, sauvegardez votre travail\n" -"et démarrez un nouveau calque sur cette nouvelle zone." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Zone Lambert" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3725,27 +3722,56 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Grille Suisse" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3759,10 +3785,10 @@ msgstr "Les signets ne peuvent être écrits.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Ne plus afficher" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3770,32 +3796,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "incomplet" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "highway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "voie ferrée" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "voie navigable" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "utilisation du terrain" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3804,5 +3830,5 @@ msgstr[1] "{0} nœuds" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3840,6 +3866,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflit" @@ -3849,11 +3875,11 @@ msgstr "Hôte inconnu" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Objet effacé" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4063,11 +4089,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4182,5 +4208,5 @@ msgstr "La longueur du nouveau segment du chemin étant actuellement dessiné." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4188,18 +4214,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(aucun objet)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Utilisateur :" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "le calque n’est pas dans la liste." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4327,50 +4353,50 @@ msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Étiquettes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Nœuds" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Membres" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Aucun conflit d’attribut n'est résolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Étiquettes ({0} conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} conflit(s) d’attribut à résoudre" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Nœuds (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4379,17 +4405,17 @@ "la liste de nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Nœuds (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Conflits à résoudre dans la liste des nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Membres (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4399,68 +4425,68 @@ "dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Membres (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Conflits à résoudre dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Pas de conflit de propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Propriétés (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Des conflits de propriété sont en attente de résolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Résolution de conflits" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "paramètre en dehors de la plage : reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "élément {0} non trouvé dans la liste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "figer le défilement" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Comparer " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Ma version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Liste des éléments de mon jeu de données, i.e. les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4468,5 +4494,5 @@ msgstr "Version fusionnée" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4476,31 +4502,31 @@ "décisions de fusion seront appliquées." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Leur version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Liste des éléments de leur jeu de données, i.e. les données du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> haut" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> bas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" "Copier mes éléments sélectionnés à la fin de la liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4510,5 +4536,5 @@ "liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4518,5 +4544,5 @@ "liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4525,5 +4551,5 @@ "fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4531,5 +4557,5 @@ "fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4539,5 +4565,5 @@ "la liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4547,54 +4573,54 @@ "la liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Monter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Remonter les éléments sélectionnés d'un cran" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Descendre" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Descendre les éléments sélectionnés d'un cran" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Supprimer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Figer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Fige la liste courante des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Libérer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Libérer la liste courante des éléments fusionnés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4605,5 +4631,5 @@ "éléments avec les miens" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4614,5 +4640,5 @@ "avec les miens" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4621,5 +4647,5 @@ msgstr[1] "Ma version ({0} éléments)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4628,5 +4654,5 @@ msgstr[1] "Version fusionnée ({0} éléments)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4635,6 +4661,6 @@ msgstr[1] "Leur version ({0} éléments)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4643,6 +4669,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4653,5 +4679,5 @@ msgstr "Nœud" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4665,5 +4691,5 @@ msgstr "index de colonne inattendu. Reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4674,19 +4700,19 @@ "serveur
Détails :{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "La communication avec le serveur a échoué" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Oui, les restaurer également" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Non, annuler l’opération" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4697,9 +4723,9 @@ "supprimés du serveur.

Voulez-vous les restaurer également ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Restaurer ces nœuds également ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4712,5 +4738,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Restaurer les primitives ?" @@ -4736,84 +4762,84 @@ msgstr "Coordonnées :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Etat supprimé :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "État visible :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(aucun)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "non supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "non visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Garder une copie de la version locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Supprimer physiquement du jeu de données local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Conserver mes coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Conserver leurs coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Ne pas résoudre le conflit de coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Conserver mon état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Conserver leur état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Ne pas résoudre le conflit d'état" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Conserver mon état de visibilité" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Oui, réinitialiser l’id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Non, annuler" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4823,17 +4849,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Réinitialisation de l’id à 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Conserver l'état de visbilité du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Oui, le supprimer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4844,9 +4870,9 @@ "données.
Êtes-vous d'accord ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Suppression du jeu de données" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Conflit non résolu entre deux états de visiblité" @@ -4863,19 +4889,19 @@ "commande de résolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4892,10 +4918,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4905,10 +4931,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4935,27 +4961,27 @@ msgstr "Leur version (jeu de données du serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Conserver la paire clé/valeur locale sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Conserver la paire clé/valeur distante sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Ne pas départager" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Marquer les étiquettes sélectionnées comme restant à départager" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4980,22 +5006,22 @@ msgstr "Pas de conflits à résoudre." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Annuler la résolution des conflits" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Appliquer les conflits résolus." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Appliquer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5003,5 +5029,5 @@ msgstr "rien" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5092,6 +5118,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5102,5 +5128,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5114,21 +5140,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "Supprimer ce membre de la relation de la relation." +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "Non décidé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "Pas encore décidé." @@ -5136,5 +5162,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Rôle :" @@ -5221,10 +5247,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5244,13 +5270,13 @@ msgstr "Pile de commande : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Résoudre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5258,5 +5284,5 @@ "liste ci-dessus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5267,25 +5293,25 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Annule la résolution de conflits et ferme la boite de dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Applique la résolution de conflits et ferme la boite de dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Appliquer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Fermer quand même" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Continuer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5297,13 +5323,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Conflit partiellement résolu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5315,8 +5341,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5383,5 +5409,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5413,34 +5439,34 @@ msgstr "Ouvrir une liste de tous les calques chargés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Supprimer le calque sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Montrer/Cacher" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Bascule l'état de visibilité du calque sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Activer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Active la couche sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Fusionne cette couche dans une autre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Déplacer le calque sélectionné un niveau vers le haut." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Déplacer le calque sélectionné un niveau vers le bas." @@ -5450,18 +5476,17 @@ msgstr "Informations à propos du calque." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Cela modifiera {0} objet maximum." -msgstr[1] "Cela modifiera {0} objets maximum." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Une valeur vide supprime la clé." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5470,10 +5495,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Changer les valeurs ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5482,5 +5507,5 @@ msgstr[1] "Modifier les propriétés de {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5489,9 +5514,9 @@ msgstr[1] "Cela modifiera {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Veuillez sélectionner une clé" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Veuillez sélectionner une valeur" @@ -5516,82 +5541,78 @@ msgstr "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Ajouter des Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Propriétés : {0} / Appartenances : {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Propriétés / Appartenances" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Changer la relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Supprimer vraiment la sélection de la relation {0} ?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Supprimer la clé sélectionnée de tous les objets" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Supprimer les propriétés" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Éditer les propriétés" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Éditer la valeur de la clé selectionnée pour tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Propriétés : {0} / Appartenances : {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Propriétés / Appartenances" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Changer la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Supprimer de la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Supprimer vraiment la sélection de la relation {0} ?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Supprimer la clé sélectionnée de tous les objets" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Supprimer les propriétés" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Ouvrir une liste de toutes les relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relations : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Ouvrir un éditeur pour la relation sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Supprimer la relation sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Créer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5599,21 +5620,21 @@ "d'édition" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5642,5 +5663,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5652,9 +5673,9 @@ msgstr "Sélection : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Détacher le panneau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5663,5 +5684,5 @@ "d'outils de gauche." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Cliquer pour minimiser/maximiser le contenu du panneau" @@ -5743,12 +5764,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "télécharger les membres de la relation" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Conflits dans les données" @@ -5768,5 +5789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5774,5 +5795,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5781,18 +5802,18 @@ "Attention : exception ignorée car la tâche est annulée. Exception : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Étiquettes et membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Relations parentes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Relations enfants" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5805,14 +5826,14 @@ "circulaires ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Les ignorer, laisser la relation telle quelle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5822,9 +5843,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5834,5 +5855,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5841,5 +5862,5 @@ "premier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5848,5 +5869,5 @@ "dernier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5854,5 +5875,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5860,20 +5881,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Éditeur de relation : supprimer la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5882,66 +5903,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "trier les membres de la relation" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "éditeur de relation : trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Déplacer les membres sélectionnés vers le haut" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Éditeur de relation : déplacer vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Déplacer les membres sélectionnés vers le bas" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Éditeur de relation : déplacer vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Supprimer le membre actuellement sélectionné de cette relation." #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "éditeur de relation : supprimer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Supprimer la relation actuellement éditée." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Oui, créer un conflit et fermer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "Non, continuer à éditer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5950,9 +5971,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Conflit dans les données." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5961,41 +5982,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Appliquer les mises-à-jour suivantes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Appliquer les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Annuler les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Ajouter un attribut vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Définir un rôle pour les membres sélectionnés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Appliquer le rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -6005,19 +6026,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Oui, l'appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "Non, ne pas l'appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "éditer la relation en référence du membre de relation sélectionné" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Téléchargement de la relation {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -6027,7 +6055,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "éditer la relation en référence du membre de relation sélectionné" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -6039,11 +6066,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Se rapporte à" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Lié" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6056,5 +6079,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6125,9 +6148,9 @@ msgstr "Marque-pages" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6136,52 +6159,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "lat min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "lon min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "lat max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "lon max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6191,52 +6214,52 @@ "télécharger la zone)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Zone de délimitation" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Sources et types de données" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Données OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Données GPS brutes" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Télécharger en tant que nouveau calque" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6244,18 +6267,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Télécharger zone" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Téléchargement" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -6263,5 +6286,5 @@ "le serveur" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -6269,17 +6292,17 @@ "serveur" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6301,22 +6324,22 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" "Échec (NullPointerException). Sans doute parce qu'il manque des attributs." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -7055,8 +7078,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7229,5 +7252,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7239,5 +7262,5 @@ msgstr "Type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7284,5 +7307,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7296,5 +7319,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7305,5 +7328,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7312,19 +7335,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7334,32 +7357,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7381,5 +7404,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7449,12 +7472,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7479,33 +7502,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Nœud {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zoomer sur le problème" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Chargement de l'historique" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Chemin {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7514,7 +7535,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Trier le menu des balises" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7532,7 +7552,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7560,10 +7579,8 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" -"Cliquer {0} pour commencer la fusion de leurs " -"éléments avec les miens" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7574,7 +7591,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonyme" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7603,17 +7619,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Version {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "supprimé" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Version {0} créée le {1} par {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7668,10 +7683,10 @@ msgstr "Fermeture de l’ensemble de changements {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7895,5 +7910,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7916,17 +7931,17 @@ msgstr "Calque" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Envoyer ?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Sauvegarder ?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Nom de fichier" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7942,7 +7957,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Tags du nouvel ensemble de changements" @@ -7985,13 +8000,13 @@ msgstr[1] "{0} objets à supprimer :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Envoyer les changements" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" @@ -7999,17 +8014,17 @@ "caractères)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -8019,39 +8034,39 @@ "utiliser une requête par primitive modifiée" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Fournissez un bref commentaire aux changements que vous envoyez :" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Ouvrir un nouvel ensemble de changements" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" "Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Utiliser ensemble de changements ouvert" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Envoyer les données vers un ensemble de changements déjà ouvert" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Fermer l'ensemble de changements après l'envoi" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "Fermer l'ensemble de changements après le prochain envoi" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -8059,16 +8074,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Charger la liste de vos ensembles de changements depuis le serveur" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Fermer l'ensemble de changements actuellement ouvert" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8114,24 +8129,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Images pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Lecture GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Aucune heure pour le point {0}·x·{1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8139,33 +8154,33 @@ msgstr "Lecture de {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Aucune image avec des informations horaires lisibles trouvée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Images géolocalisées" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Allumage du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Extinction du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "variation différentielle actuelle : {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "différence de fuseau horaire : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8174,14 +8189,14 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} dans la trace." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Synchroniser l’horloge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8189,32 +8204,32 @@ msgstr "images JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Image" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synchroniser l’heure avec l’instrument GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "La date indiquée ne peut être analysée." @@ -8304,5 +8319,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8354,10 +8369,10 @@ msgstr[1] "{0} chemins" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Convertir en calque de données" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8368,11 +8383,11 @@ "regardez ici :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8382,29 +8397,29 @@ msgstr "Converti depuis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Télécharger depuis OSM le long de cette trace" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Tout télécharger dans un rayon de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} mètres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Aire maximale par requête:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8415,5 +8430,5 @@ "Voulez-vous
continuer ?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -8421,5 +8436,5 @@ "audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8429,5 +8444,5 @@ "chemin ont été omis ou déplacés au début." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8437,19 +8452,19 @@ "estimer leur horodatage ont été omis." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Couche de données {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -8457,5 +8472,5 @@ "0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8464,5 +8479,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8476,5 +8491,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8487,11 +8502,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8500,22 +8515,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "non défini" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convertir en calque GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Pas de chemin d'origine trouvé." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8616,9 +8644,9 @@ "décalage ." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Afficher/Masquer Texte/Icônes" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Bascule l'état de visibilté du marqueur de texte et d'icônes." @@ -8686,5 +8714,5 @@ "été utilisé)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8692,5 +8720,5 @@ msgstr "Veuille sélectionnez la rangée à éditer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8698,5 +8726,5 @@ msgstr "Nouvelle valeur pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8705,5 +8733,5 @@ msgstr "Veuillez sélectionnez la rangée à supprimer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Entrez une nouvelle paire clé/valeur" @@ -8849,40 +8877,40 @@ msgstr "Calibration de l’enregistrement de la voix" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Couleur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Style de rendu {0} : {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Couche : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Choisir" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Choisir une couleur pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Mettre la valeur par défaut" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Réinitialiser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Couleurs utilisées par les différents objets dans JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Couleurs" @@ -9340,17 +9368,17 @@ msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Afficher les coordonnées en" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Méthode de projection" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9360,5 +9388,5 @@ msgstr "Projection de la carte" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9416,81 +9444,81 @@ msgstr "Raccourci" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Chemins des icônes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Description brève : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "auteur : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "page web : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9499,6 +9527,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9687,10 +9715,10 @@ msgstr "Touches de raccourcis" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9700,13 +9728,13 @@ msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "AJouter un nouvel attribut" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Supprimer la sélection dans la table des attributs" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9714,18 +9742,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Attributs optionnels:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "voie sans issue" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Type inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9736,15 +9764,15 @@ msgstr "Impossible de lire la source des balises prédéfinies : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Erreur de traitement {0} : " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Les éléments de type {0} sont avalisés." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9754,18 +9782,18 @@ msgstr[1] "Changer {0} objets." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Changer les propriétés" @@ -9781,6 +9809,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9789,8 +9817,21 @@ msgstr "Contact du serveur OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Téléchargement des points {0} à {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\"" #. SAXException does not chain correctly @@ -9910,5 +9951,5 @@ msgstr "Mode {0} inconnu." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -9917,6 +9958,6 @@ "déduire le type de primitive" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9926,20 +9967,20 @@ msgstr "Téléchargement des données OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -9947,20 +9988,20 @@ "Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10028,5 +10069,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -10041,66 +10082,66 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Création d'un ensemble de changements…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "ensemble de changements {0} ouvert avec succès" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Mise à jour de l'ensemble de changements" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Mise à jour de l’ensemble de changements {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Envoi en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Attends 10 secondes… " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10135,5 +10176,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10160,5 +10201,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10166,5 +10207,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10177,5 +10218,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10341,5 +10382,5 @@ msgstr "Le fichier \"{0}\" n'existe pas" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10348,38 +10389,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10387,19 +10428,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Champ incomplet avec ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "L’objet avec l’id=0 est illégal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10409,10 +10450,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10422,25 +10461,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10909,5 +10948,5 @@ msgstr "(Ce texte a déjà été copié dans votre presse-papier.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10916,12 +10955,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10931,5 +10963,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10942,10 +10974,5 @@ "d’erreur est :
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10954,5 +10981,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10961,5 +10988,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10968,9 +10995,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10980,5 +11014,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10989,5 +11023,5 @@ "votre connexion internet." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10996,5 +11030,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -11006,10 +11040,10 @@ "tard." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -11018,10 +11052,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -11032,5 +11066,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -11040,5 +11074,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11786,5 +11820,5 @@ msgstr "Erreur sur le fichier {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11800,29 +11834,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "Sélectionner la feuille cadastrale." -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Fichier tampon de la zone Lambert 1 (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Fichier tampon de la zone Lambert 1 (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Fichier tampon de la zone Lambert 2 (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Fichier tampon de la zone Lambert 3 (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Fichier tampon de la zone Lambert 4 (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11853,13 +11907,13 @@ msgstr "Choisir parmi..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11873,13 +11927,13 @@ "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "Restaurer la fontion de téléchargement à la touche F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM est arreté pour que la modification prenne effet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12184,44 +12238,51 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Zone Lambert" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" "Télécharger la zone depuis le tampon (seulement si le tampon est activé)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"La zone Lambert {0} en cache est incompatible avec la zone Lambert {1} " +"courante" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Changer de lieu" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Définir un nouveau lieu pour la prochaine requête" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Ajouter un nouveau calque" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Localisation" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12231,5 +12292,5 @@ "ponctuation disponible sur www.cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Ajouter un nouveau calque" @@ -12260,5 +12321,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Ajuster WMS" @@ -12288,5 +12349,5 @@ "Sélectionnez en une dans la liste, puis réessayez" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12294,28 +12355,28 @@ msgstr "Calque vide" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "N'est pas vectorisée." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Est vectorisée." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Zone de délimitation de la commune : {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12326,9 +12387,9 @@ "Veuillez en créer un nouveau." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Erreur de format du tampon" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12337,16 +12398,7 @@ "courante" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Erreur de tampon de zone Lambert" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13417,20 +13469,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Voulez-vous permettre celà?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Confirmer l’action Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "Il a été demandé à Remote Control de créer un nouveau nœud." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13554,13 +13606,9 @@ msgstr "Diminuer le zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Réinitialiser la mémoire tampon des tuiles" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "image " @@ -14152,6 +14200,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Ligne de côte désordonnée" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14825,12 +14874,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Téléchargement" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Télécharger des données depuis le serveur OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14846,9 +14893,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Il n’y a pas de calque vers lequel
\"{0}\"
le calque source " -"puisse être fusionné." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14870,7 +14915,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Suppression des nœuds en doublon..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14938,29 +14982,29 @@ msgstr "Pas d’URL WMS valide ou d’id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Ajuster la position du calque WMS sélectionné" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Veuillez sélectionner le calque WMS à ajuster." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Sélectionnez le calque WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Commencer à ajuster" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "Il n'y a actuellement pas de calque WMS à ajuster." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "Pas de calque à ajuster." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14971,5 +15015,5 @@ "« ? »." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14979,10 +15023,10 @@ "vérifier vos réglages de préférences." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "Attention : l’URL complète est ''{0}''." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14997,5 +15041,5 @@ msgstr "Téléchargement automatique" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -15003,19 +15047,19 @@ "Attention : couche WMS désactivée à cause d’une adresse malformée « {0} »" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(désactivé)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -15026,13 +15070,13 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Oui, récupérer les images" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "URL invalide ?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -15041,37 +15085,37 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Charger la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -15080,7 +15124,12 @@ "attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Erreur de format de fichier" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Marque-pages" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -19557,5 +19606,5 @@ #: build/trans_presets.java:1841 msgid "Palaeontological Site" -msgstr "" +msgstr "Site paléontologique" #. item "Historic Places/Palaeontological Site" @@ -19563,5 +19612,5 @@ #: build/trans_presets.java:1843 msgid "Edit Palaeontological Site" -msgstr "" +msgstr "Éditer un site paléontologique" #. item "Historic Places/Palaeontological Site" text "Name" @@ -27446,8 +27495,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "combinaison inhabituelle d'attributs" @@ -27467,34 +27515,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "Cartes NPE" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "Cartes NPE (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27504,9 +27541,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Rues Geofabrik.de de Rhénanie-du-Nord-Westphalie" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27520,106 +27560,130 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Impossible de rechercher car il n’y a pas de données chargées." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Il n’y a pas de primitive de version {0} dans cet historique" - -#~ msgid "There's no version valid at date ''{0}'' in this history." +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "Cartes NPE" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "Cartes NPE (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Fichier tampon de la zone Lambert 2 (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Fichier tampon de la zone Lambert 3 (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Fichier tampon de la zone Lambert 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Fichier tampon de la zone Lambert 2 (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Fichier tampon de la zone Lambert 3 (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Fichier tampon de la zone Lambert 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Fichier tampon de la zone Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Fichier tampon de la zone Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Fichier tampon de la zone Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Fichier tampon de la zone Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Fichier tampon de la zone Lambert 1 (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." #~ msgstr "" -#~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "pas de verison plus ancienne trouvée. L’historique est vide." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "pas de version plus récente trouvée. L’historique est vide." - -#~ msgid "No type found. History is empty." -#~ msgstr "Pas de type trouvé. L'historique est vide." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données" - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "" -#~ "Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données" - -#~ msgid "Select a starting node on the end of a way" -#~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin" - -#~ msgid "Reached the end of the line" -#~ msgstr "Fin de la ligne atteinte" - -#~ msgid "Reached a junction" -#~ msgstr "Intersection atteinte" - -#~ msgid "help" -#~ msgstr "aide" - -#~ msgid "Help / About" -#~ msgstr "Aide / À propos" - -#~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " -#~ "- these will then show up in the WMS menu.\n" -#~ "\n" -#~ "You can also do this manually in the Advanced Preferences, using the " -#~ "following schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " -#~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " -#~ "in this example, replacing 73 with your image id:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " -#~ "use." -#~ msgstr "" -#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet " -#~ "des préférences de WMSplugin - ces options s’afficheront dans le menu " -#~ "WMS.\n" -#~ "\n" -#~ "Vous pouvez également effectuer ceci dans les Préférences Avancées, en " -#~ "utilisant le schéma suivant :\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Exemple d’URL WMS complète (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/" -#~ "rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n" -#~ "Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez " -#~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de " -#~ "votre image :\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au " -#~ "niveau du copyright, dans le doute, ne l'utilisez pas." - -#~ msgid "WMS Plugin Help" -#~ msgstr "Aide sur le greffon WMS" +#~ "IMPORTANT : données positionnées trop loin\n" +#~ "de la zone de Lambert actuelle.\n" +#~ "Ne plus charger de données après ce message.\n" +#~ "Annulez votre dernière action, sauvegardez votre travail\n" +#~ "et démarrez un nouveau calque sur cette nouvelle zone." + +#~ msgid "Edit Properties" +#~ msgstr "Éditer les propriétés" + +#~ msgid "Linked" +#~ msgstr "Lié" #~ msgid "Move" @@ -27696,4 +27760,7 @@ #~ msgid "Error while loading page {0}" #~ msgstr "Erreur durant le chargement de la page {0}" + +#~ msgid "help" +#~ msgstr "aide" #~ msgid "Validate" @@ -27737,4 +27804,7 @@ #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" + +#~ msgid "Help / About" +#~ msgstr "Aide / À propos" #~ msgid "Navigation" @@ -27855,4 +27925,7 @@ #~ msgid "Please select the row to copy." #~ msgstr "Veuillez sélectionner la colonne à copier" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Aide sur le greffon WMS" #~ msgid "Station" @@ -28380,4 +28453,13 @@ #~ "ATTENTION : valeur inattendue du paramètre conflict.resolution, reçu " +#~ msgid "Reached the end of the line" +#~ msgstr "Fin de la ligne atteinte" + +#~ msgid "Select a starting node on the end of a way" +#~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin" + +#~ msgid "Reached a junction" +#~ msgstr "Intersection atteinte" + #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Vérification si le nœud {0} est supprimé..." @@ -28464,4 +28546,57 @@ #~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données" +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "" +#~ "Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données" + +#~ msgid "" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" +#~ "\n" +#~ "You can also do this manually in the Advanced Preferences, using the " +#~ "following schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Full WMS URL input format example (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " +#~ "only need to input the relevant 'id'.\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " +#~ "use." +#~ msgstr "" +#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet " +#~ "des préférences de WMSplugin - ces options s’afficheront dans le menu " +#~ "WMS.\n" +#~ "\n" +#~ "Vous pouvez également effectuer ceci dans les Préférences Avancées, en " +#~ "utilisant le schéma suivant :\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Exemple d’URL WMS complète (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/" +#~ "rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n" +#~ "Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez " +#~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de " +#~ "votre image :\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au " +#~ "niveau du copyright, dans le doute, ne l'utilisez pas." + #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" #~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" @@ -28511,4 +28646,7 @@ #~ msgid "Download referrers from OSM..." #~ msgstr "Téléchargement des référents depuis OSM..." + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Impossible de rechercher car il n’y a pas de données chargées." #~ msgid "Do you really want to delete layer ''{0}''?" @@ -28602,4 +28740,7 @@ #~ "HREF=\"{1}\">votre langage." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Page d’aide manquante. Créez la sur English." @@ -28622,4 +28763,17 @@ #~ msgstr "valeur inattendue retournée. Reçue {0}" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Il n’y a pas de primitive de version {0} dans cet historique" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "" +#~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "pas de verison plus ancienne trouvée. L’historique est vide." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "pas de version plus récente trouvée. L’historique est vide." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "index en dehors des limites. Reçu {0}" @@ -28649,2 +28803,5 @@ #~ msgid "Please enter the desired coordinates first." #~ msgstr "Veuillez d’abord saisir les coordonnées désirées." + +#~ msgid "No type found. History is empty." +#~ msgstr "Pas de type trouvé. L'historique est vide." Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 18772) +++ applications/editors/josm/i18n/po/gl.po (revision 18773) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" "PO-Revision-Date: 2009-09-22 15:04+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Axuda" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de ficheiro mal formada: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Erro" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -302,5 +303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -309,27 +310,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -347,5 +348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Cancelar" @@ -355,19 +356,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -376,5 +377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -487,13 +488,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -591,20 +592,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Ficheiro: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -644,10 +645,10 @@ "serie de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona polo menos dúas vías para combinar." @@ -691,10 +692,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -713,11 +714,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Sobrescribir" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "O ficheiro existe. Sobrescribir?" @@ -765,5 +766,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -772,6 +773,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -787,7 +788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -815,5 +815,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplicar" @@ -837,30 +837,30 @@ msgstr "Sair da aplicación," -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportar a GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportar os datos a un ficheiro GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nada que exportar. Adquire antes algún dato." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -868,13 +868,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -893,8 +893,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -902,7 +902,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -925,9 +925,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -939,5 +939,5 @@ msgstr "o parámetro \"{0}\" debe non ser nulo" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -945,5 +945,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "" @@ -1089,6 +1089,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nova" @@ -1217,5 +1217,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Pegar" @@ -1305,11 +1305,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Gardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Gardar os datos actuais." @@ -1366,10 +1366,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Gardar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Gardar os datos actuais nun novo ficheiro." @@ -1388,10 +1388,10 @@ "tamén os obxectos incompletos." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Amosar Informe de Estado" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1399,20 +1399,20 @@ "ós erros" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Axda: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Informe de Estado" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Copiar a porta papeis e pechar" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1578,5 +1578,5 @@ msgstr "Despegar Nodo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1584,5 +1584,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1629,55 +1629,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Actualizar Selección" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Actualizar Selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Non hai primitivas seleccionadas para actualizar." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Selección valeira" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Actualizar Selección" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1686,5 +1683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1692,29 +1689,29 @@ msgstr "Non hai cambios que subir." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algún dato antes." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Sincronizar o paquete de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1736,11 +1733,11 @@ "continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1756,5 +1753,5 @@ "editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1764,22 +1761,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1790,19 +1787,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Actualizando primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1811,5 +1808,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1818,15 +1815,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1938,17 +1935,17 @@ msgstr "Avance máis lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Datos GPX Descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Descargando datos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1956,5 +1953,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -2008,9 +2005,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Erros durante a descarga" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2028,5 +2025,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2034,5 +2031,5 @@ msgstr "Modo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2129,8 +2126,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." msgstr "" -"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2140,9 +2135,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Arrastrar un segmento de vía para crear un rectángulo." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2156,5 +2150,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2174,17 +2168,17 @@ msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2194,13 +2188,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2209,9 +2203,9 @@ "próximo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Soltar o botón do rato para deter a rotación." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2221,15 +2215,15 @@ "cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar selección" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Facer zoom e mover mapa" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2239,10 +2233,10 @@ "+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Buscar..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2251,58 +2245,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Por favor, introduce unha cadea de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "expresión regular" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "reemplazar selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "engadir á selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "eliminar da selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "sensible a maiúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "expresión regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' e 'Street' en calquer clave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' en calquera clave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' en calquer posición do nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - a clave 'type' co valor exacto 'route'" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2312,34 +2305,34 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - que non conteña 'Bak' no nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - clave=foot establecida con calquer valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Obxectivos especiais:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - tipo do obxecto(node,way,relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - todos os obxectos cambiados polo usuario" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - obxectro có número de nodos indicado" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2347,21 +2340,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - todos os obxectos cambiados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - todos os obxectos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos os obxectos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - todos os obxectos sen etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" @@ -2370,5 +2363,5 @@ "coa expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" @@ -2377,17 +2370,17 @@ "expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "Usar | ou OR para combinar co operador OU lóxico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Usar \" para escapar operadores (p.e. se a clave conten : )" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Usar ( e ) para agrupar expresións" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2397,51 +2390,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Comezar Busca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Non se atoparon coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Non se engadiu nada á selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Non se eliminou da selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Atopadas {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2459,14 +2452,14 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2475,26 +2468,26 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Faltan argumentos para OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Faltan argumentos para NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Esperabase parentese de peche." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2503,9 +2496,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parámetros incorrecto para o operador nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2516,5 +2509,5 @@ "de nodos ou un rango, por exemplo nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2612,7 +2605,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2722,5 +2715,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2745,5 +2738,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2751,6 +2744,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2820,18 +2813,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Resolver conflitos en estado borrado en {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2866,10 +2849,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolver conflitos na lista de membros da relación {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2902,20 +2885,20 @@ msgstr "Secuencia" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2937,10 +2920,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2984,5 +2967,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Novo valor" @@ -3029,7 +3012,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Requírese o parámetro {0} > 0. Obtívose {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3038,10 +3021,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ficheiro de configuración mal formado nas liñas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3050,5 +3033,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3057,5 +3040,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3064,5 +3047,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3071,5 +3054,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3077,5 +3060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3084,5 +3067,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3091,5 +3074,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3098,5 +3081,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3105,10 +3088,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3189,25 +3172,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3215,5 +3198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3221,5 +3204,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3229,26 +3212,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Faltan argumentos para NOT." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3257,5 +3240,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3318,24 +3301,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3343,5 +3326,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3369,10 +3352,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3383,7 +3366,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Requírese o parámetro {0} > 0. Obtívose {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3402,8 +3385,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." msgstr "" -"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\"" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3538,10 +3520,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3553,6 +3535,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3562,5 +3544,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3570,6 +3552,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3587,6 +3569,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "fondo" @@ -3604,19 +3586,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Zona Lambert (Estonia)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3630,26 +3629,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3664,10 +3688,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Non amosar de novo" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3675,32 +3699,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "Carretera" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "Vía férrea" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "Vía acuática" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3709,5 +3733,5 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3745,6 +3769,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflito" @@ -3754,11 +3778,11 @@ msgstr "Maquina descoñecida" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3962,11 +3986,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4081,5 +4105,5 @@ msgstr "A lonxitude do novo segmento de vía que se está a debuxar." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4087,18 +4111,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(sen obxecto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "a capa non está na lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4222,67 +4246,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4290,68 +4314,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4359,5 +4383,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4365,30 +4389,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4396,5 +4420,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4402,14 +4426,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4417,5 +4441,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4423,54 +4447,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Eliminar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4479,5 +4503,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4486,5 +4510,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4493,5 +4517,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4500,5 +4524,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4507,6 +4531,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4515,6 +4539,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4525,5 +4549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4535,5 +4559,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4542,19 +4566,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Si, desfacer o borrado de eles tamén" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Non, cancelar a operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4565,9 +4589,9 @@ "servidor.

Quere desfacer o borrado de eses nodos tamén?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Desfacer o borrado de nodos adicionais?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4577,5 +4601,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Desfacer o borrado de primitivas dependentes?" @@ -4599,84 +4623,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4686,17 +4710,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4705,9 +4729,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4722,19 +4746,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4750,10 +4774,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4763,10 +4787,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4793,27 +4817,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4838,22 +4862,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4861,5 +4885,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4950,6 +4974,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4960,5 +4984,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4972,21 +4996,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4994,5 +5018,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5079,10 +5103,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5102,13 +5126,13 @@ msgstr "Pila de Comandos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5116,5 +5140,5 @@ "superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5123,25 +5147,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5153,13 +5177,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5171,8 +5195,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5239,5 +5263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5270,34 +5294,34 @@ msgstr "Abrir unha lista de todas as capas cargadas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Borrar a capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Amosar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Cambiar o estado visible da capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Mover a capa seleccionada unha fila cara arriba." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Mover a capa seleccionada unha fila cara abaixo." @@ -5307,18 +5331,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Esto cambiará ata {0} obxecto." -msgstr[1] "Esto cambiará ata {0} obxectos." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Un valor vacío borra a clave." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5327,10 +5350,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Cambiar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5339,5 +5362,5 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5346,9 +5369,9 @@ msgstr[1] "Esto cambiará ata {0} obxectos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Por favor, selecciona unha tecla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Por favor selecciona un valor" @@ -5373,102 +5396,98 @@ msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Cambiar relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Borrar realmente a selección da relación {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Borrar a clave seleccionada en todos os obxectos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Borrar Propiedades" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Engadir un novo par clave/valor para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Editar Propiedades" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da clave seleccionada para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Cambiar relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Borrar da relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Borrar realmente a selección da relación {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Borrar a clave seleccionada en todos os obxectos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Borrar Propiedades" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relacións" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Abrir unha lista con todas as relacións." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relacións: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Abrir un editor para a relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Borrar a relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Crear unha nova relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5497,5 +5516,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5507,9 +5526,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Desacoplar o panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5518,5 +5537,5 @@ "da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Facer click para minimizar/maximizar o contido do panel" @@ -5598,12 +5617,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5621,5 +5640,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5627,5 +5646,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5633,18 +5652,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5653,14 +5672,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5670,9 +5689,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5682,15 +5701,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5698,5 +5717,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5704,20 +5723,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5726,66 +5745,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Mover os membros actualmente seleccionados cara arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Mover os membros seleccionados actualmente cara abaixo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5794,9 +5813,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5805,41 +5824,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Descargar todas as vías e nodos incompletos na relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5849,19 +5868,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Descargando datos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5882,10 +5908,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5899,5 +5921,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5967,9 +5989,9 @@ msgstr "Marcadores" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5978,52 +6000,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "lat. min." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "lon. min." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "lat. max." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "lon. max." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6033,52 +6055,52 @@ "área)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Fontes de Datos e Tipos" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Datos OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Datos GPS en bruto" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Descargar como unha nova capa" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6086,23 +6108,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Área de Descarga" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Descargar" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" "Área de descarga demasiado grande; probablemente será rexeitada polo servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -6110,17 +6132,17 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6142,21 +6164,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6895,8 +6917,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7069,5 +7091,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7079,5 +7101,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7124,5 +7146,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7136,5 +7158,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7145,5 +7167,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7152,19 +7174,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7174,32 +7196,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7221,5 +7243,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7281,12 +7303,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "Requírese o parámetro {0} > 0. Obtívose {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "Requírese o parámetro {0} > 0. Obtívose {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7311,33 +7333,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Facer zoom a {0}" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Historial" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7346,7 +7366,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Ordenar o menú de elementos preestablecidos" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7364,7 +7383,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7404,7 +7422,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anónimo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7432,12 +7449,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versión {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "borrado" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7495,10 +7511,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7709,5 +7725,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7730,17 +7746,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7756,7 +7772,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7799,29 +7815,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Subir Cambios" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7829,38 +7845,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Proporciona un breve comentario para os cambios que vas a subir:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7868,16 +7884,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7921,24 +7937,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Imaxes para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Ler GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Non hai hora para o punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7946,33 +7962,33 @@ msgstr "Lendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Non se atoparon imaxes con marcas de tempo lexibles." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Imaxes xeo-etiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Inicio GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Fin GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "Diferencia de zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7981,14 +7997,14 @@ msgstr[1] "imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} dentro da traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Sincronizar reloxo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7996,32 +8012,32 @@ msgstr "imaxes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "A data no ficheiro \"{0}\" non puido ser analizada." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Non hai hora EXIF no ficheiro \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Imaxe" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horaria da unidade GPS (differencia coa foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar hora coa da unidade GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "A hora introducida non puido ser analizada." @@ -8111,5 +8127,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8161,10 +8177,10 @@ msgstr[1] "{0} puntos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8174,11 +8190,11 @@ "perxudicial.
Se desexas subir trazados, mira aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8188,29 +8204,29 @@ msgstr "Convertido de: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Descargar todo o que abarca:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km cad." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8221,9 +8237,9 @@ "Desexas
continuar?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8231,5 +8247,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8239,23 +8255,23 @@ "correctamente os seus tempos foron omitidos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "fora da área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8264,5 +8280,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8276,5 +8292,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8287,11 +8303,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8300,22 +8316,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Non se atoparon vias \"desde\"." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8411,9 +8440,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Amosar/Ocultar Texto/Iconas" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Cambiar o estado visible do texto e iconas da marca." @@ -8476,5 +8505,5 @@ "O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8482,5 +8511,5 @@ msgstr "Por favor selecciona a fila a editar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8488,5 +8517,5 @@ msgstr "Novo valor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8495,5 +8524,5 @@ msgstr "Por favor seleccione a fila a borrar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Introduce un novo par clave/valor." @@ -8634,40 +8663,40 @@ msgstr "Calibración do grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Cor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Estilo de pintura {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Capa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Escoller" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Escolle unha cor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Establecer a predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Establecer todos ós predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Cores usadas por diferentes obxectos en JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Cores" @@ -9118,17 +9147,17 @@ msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Amosar coordenadas como" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Método de proxección" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9138,5 +9167,5 @@ msgstr "Proxección do mapa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9194,81 +9223,81 @@ msgstr "Atallo" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9277,6 +9306,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9467,10 +9496,10 @@ msgstr "Grupos de modificadores" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9480,13 +9509,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9494,18 +9523,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Atributos Opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "vía pechada" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Tipo descoñecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9516,15 +9545,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Erro analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Os elementos do tipo {0} están soportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9534,18 +9563,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -9561,6 +9590,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9569,8 +9598,21 @@ msgstr "Contactando co Servidor OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Descargando os puntos {0} a {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9687,11 +9729,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9701,40 +9743,40 @@ msgstr "Descargando datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9799,5 +9841,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9810,66 +9852,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Pechando colección de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Subindo..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9904,5 +9946,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9929,5 +9971,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9935,5 +9977,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9946,5 +9988,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10097,5 +10139,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10104,38 +10146,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10143,19 +10185,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta de elemento con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Obxecto ilegal con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10165,10 +10207,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10178,25 +10218,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10658,5 +10698,5 @@ msgstr "(O texto xa foi copiado ao teu portapapeis.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10665,12 +10705,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10680,5 +10713,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10691,10 +10724,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10703,5 +10731,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10710,5 +10738,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10717,9 +10745,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10729,5 +10764,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10736,5 +10771,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10743,5 +10778,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10750,10 +10785,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10762,10 +10797,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10776,5 +10811,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10784,5 +10819,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11494,5 +11529,5 @@ msgstr "Erro no ficheiro {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11505,29 +11540,48 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Erro cargando ficheiro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Ficheiro de caché da Zona Lambert 1 (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Ficheiro de caché da Zona Lambert 1 (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Ficheiro de caché da Zona Lambert 2 (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Ficheiro de caché da Zona Lambert 3 (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Ficheiro de caché da Zona Lambert 4 (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11556,13 +11610,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11571,13 +11625,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11859,43 +11913,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11903,5 +11962,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11932,5 +11991,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11958,5 +12017,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11964,28 +12023,28 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11996,24 +12055,15 @@ "Crear unha nova." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -13039,20 +13089,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13174,13 +13224,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13750,5 +13796,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +msgid "Unconnected coastline" msgstr "" @@ -14393,12 +14439,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Descargar" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Descargar datos do mapa do servidor OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14436,7 +14480,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Acoplar {0} nodos" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14502,29 +14545,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14533,5 +14576,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14539,10 +14582,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14555,24 +14598,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14583,57 +14626,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Gardar capa WMS nun ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Cargar capa WMS dende ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Marcadores" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26943,8 +26991,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26964,34 +27011,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -27001,9 +27037,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27017,33 +27056,114 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Non hai unha primitiva coa versión {0} en este historial" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "Non hai unha versión válida con data \"{0}\" en este historial" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "non se atopou unha versión anterior. O historial está valeiro." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "non se atopou a última versión. O historial está valeiro." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos" - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "" -#~ "Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de " -#~ "datos" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Ficheiro de caché da Zona Lambert 2 (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Ficheiro de caché da Zona Lambert 3 (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Ficheiro de caché da Zona Lambert 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Ficheiro de caché da Zona Lambert 2 (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Ficheiro de caché da Zona Lambert 3 (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Ficheiro de caché da Zona Lambert 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Ficheiro de caché da Zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Ficheiro de caché da Zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Ficheiro de caché da Zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Ficheiro de caché da Zona Lambert 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Ficheiro de caché da Zona Lambert 1 (.1)" + +#~ msgid "Edit Properties" +#~ msgstr "Editar Propiedades" #~ msgid "" @@ -27493,4 +27613,9 @@ #~ "conxunto de datos" +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "" +#~ "Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de " +#~ "datos" + #~ msgid "Help page missing. Create it in English." #~ msgstr "Páxina de axuda perdida. Créea en inglés." @@ -27503,4 +27628,19 @@ #~ "\"{1}\">galego." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos" + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "valor retornado non esperado. Obtívose {0}" + +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Non hai unha primitiva coa versión {0} en este historial" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Non hai unha versión válida con data \"{0}\" en este historial" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "non se atopou unha versión anterior. O historial está valeiro." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "non se atopou a última versión. O historial está valeiro." Index: applications/editors/josm/i18n/po/he.po =================================================================== --- applications/editors/josm/i18n/po/he.po (revision 18772) +++ applications/editors/josm/i18n/po/he.po (revision 18773) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" "PO-Revision-Date: 2009-10-17 15:07+0000\n" "Last-Translator: Tsvi Mostovicz \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "עזרה" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "אזהרה" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "אין אפשרות לקרוא קובץ''{0}''.
הודעת שגיאה:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "אין אפשרות לקרוא קובץ''{0}''.
הודעת שגיאה:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "שגיאה" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -306,5 +307,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -313,27 +314,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -351,5 +352,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "ביטול" @@ -359,19 +360,19 @@ msgstr "אנא בחר לפחות צומת, דרך, או הקשר אשר כבר הועלו למאגר" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "אנא בחר בשכת היעד" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "בחר שכבת יעד" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "מזג" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -380,5 +381,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "אין שכבות יעד" @@ -491,13 +492,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -595,20 +596,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "קובץ: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -644,10 +645,10 @@ msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "שלב {0} דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "נא בחר לפחות שתי דרכים לשילוב." @@ -692,10 +693,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -714,11 +715,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "שכתוב" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "הקובץ כבר קיים. לשכתב?" @@ -765,5 +766,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -772,6 +773,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -787,7 +788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -815,5 +815,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "שכפל" @@ -837,30 +837,30 @@ msgstr "צא מהיישום." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "כל הפורמטים" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "ייצא ל-GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "ייצא נתונים לקובץ GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "אין מה לייצא. השג נתונים תחילה." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -868,13 +868,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -893,8 +893,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -902,7 +902,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -925,9 +925,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -939,5 +939,5 @@ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -945,5 +945,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "יצא קובץ GPX" @@ -1089,6 +1089,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "חדש" @@ -1217,5 +1217,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "הדבק" @@ -1303,11 +1303,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "שמירה" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "שמור את הנתונים הנוכחיים." @@ -1364,10 +1364,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "שמור בשם..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "שמור את המידע הנוכחי לקובץ חדש." @@ -1385,29 +1385,29 @@ "בחר את כל העצמים הבלתי בחורים בשכבת הנתונים. גם עצמים בלתי גמורים ייבחרו." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "הצג דו\"ח מצב" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "עזרה: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "דו\"ח מצב" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "העתק ללוח הגזירים וסגור" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1559,5 +1559,5 @@ msgstr "הפרד נקודה" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1565,5 +1565,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1610,55 +1610,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "עדכן בחירה" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "עדכן בחירה" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "העתק את הפריטים הנבחרים אל חוצץ ההדבקה." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "בחירה ריקה" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "עדכן בחירה" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1667,5 +1664,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1673,29 +1670,29 @@ msgstr "אין שינויים להעלאה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "אין מה להעלות. קבל כמה נתונים תחילה." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "סנכרן את כל סט הנתונים" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1709,11 +1706,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1724,5 +1721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1732,22 +1729,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1758,19 +1755,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1779,5 +1776,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1786,15 +1783,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1906,17 +1903,17 @@ msgstr "הרצה איטית יותר" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "מוריד נתוני GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "הורדו נתוני GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "מוריד נתונים" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1924,5 +1921,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1976,9 +1973,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "שגיאות במהלך הורדה" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -1996,5 +1993,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2002,5 +1999,5 @@ msgstr "נקודה: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2097,7 +2094,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "צייר מרובע בגודל הרצוי, ואז שחרר את לחצן העכבר." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2106,9 +2102,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "גרור מקטע דרך ליצירת מרובע" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2122,5 +2117,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2140,17 +2135,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2160,13 +2155,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2174,9 +2169,9 @@ "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "שחרר את סמן העכבר להפסקת ההטייה" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2184,15 +2179,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "מיקוד" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "התמקד והזז את המפה" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2200,10 +2195,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "חפש..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2212,58 +2207,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "נא הזן מחרוזת לחיפוש." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "ביטוי רגולרי" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "החלפת הבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "הוספה לבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "הסר מהבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "רגיש להבדל בין אותיות גדולות וקטנות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "ביטוי רגולרי" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "רחוב אבג-'רחוב' ו'אבג' בכל מפתח או שם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"רחוב אבג\"-'רחוב אבג' בכל מפתח או שם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:אבג-'אבג' איפשהו בשם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route-מפתח 'type' עם הערך 'route' במדוייק." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2273,34 +2267,34 @@ "*=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:אבג-ללא 'אבג' בשם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot:-מפתח 'foot' עם כל ערך." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "מטרות מיוחדות:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" msgstr "type:-סוג העצם (נקודה, דרך, יחס)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:...-כל העצמים ששונו ע\"י המשתמש" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:...-עצמים עם מספר הנקודות הנתון" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2308,43 +2302,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified...- כל העצמים ששונו" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - כל העצמים הבחורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - כל העצמים הבלתי גמורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - כל העצמים הלא מתוייגים" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "השתמש ב-| או OR כדי לחבר ב\"או\" לוגי" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "השתמש ב-( ו ) כדי לצרף ביטויים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2354,51 +2348,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "חפש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "התחל חיפוש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "לא נמצאה התאמה עבור \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "נמצאו {0} התאמות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2415,40 +2409,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "חסרים ארגומנטים ל-or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "חסרים ארגומנטים ל-not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "ציפיתי לסוגר סוגריים." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2457,9 +2451,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2468,5 +2462,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2566,7 +2560,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2676,5 +2670,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2699,5 +2693,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2705,6 +2699,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2773,17 +2767,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2817,10 +2801,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2853,20 +2837,20 @@ msgstr "רצף" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2888,10 +2872,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2933,5 +2917,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "ערך חדש" @@ -2987,10 +2971,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "קובץ תצורה לא תקין בשורות {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -2999,5 +2983,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3006,5 +2990,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3013,5 +2997,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3020,5 +3004,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3026,5 +3010,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3033,5 +3017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3040,5 +3024,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3047,5 +3031,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3054,10 +3038,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3138,25 +3122,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "דרום" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "צפון" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "מערב" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "מזרח" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3164,5 +3148,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3170,5 +3154,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3178,26 +3162,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "חסרים ארגומנטים ל-not." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3206,5 +3190,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3267,24 +3251,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3292,5 +3276,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3318,10 +3302,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3332,7 +3316,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3486,10 +3470,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "שגיאה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3501,6 +3485,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3510,5 +3494,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3518,6 +3502,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3535,6 +3519,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "רקע" @@ -3552,19 +3536,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3578,26 +3578,51 @@ msgstr "מרקטור" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3612,10 +3637,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "אל תציג שוב" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3623,32 +3648,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "לא גמור" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "כביש ראשי" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "מסילת רכבת" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "נתיב מים" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3657,5 +3682,5 @@ msgstr[1] "{0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3693,6 +3718,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "התנגשות" @@ -3702,11 +3727,11 @@ msgstr "מארח לא ידוע" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3908,11 +3933,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4027,5 +4052,5 @@ msgstr "אורך קטע הדרך החדש מצויר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4033,18 +4058,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(אין עצם)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "השכבה אינה ברשימה." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4165,67 +4190,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "תכונות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "תוויות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "חברים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "נקודות (פתורות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "נקודות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "חברים (פתורים)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4233,68 +4258,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "חברים (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "תכונות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "פתרון התנגשות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "הפריט {0} לא נמצא ברשימה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "נעל גלילה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "השווה " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "הגירסה שלי" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4302,5 +4327,5 @@ msgstr "גירסה ממוזגת" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4308,30 +4333,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "הגירסה שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> ראש" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "העתק את הנקודות הנבחרות שלי לראשית רשימת הנקודות הממוזגת" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> תחתית" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "העתק את האלמנטים הנבחרים שלי לסוף רשימת האלמנטים הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4341,5 +4366,5 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4349,14 +4374,14 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "העתק את האלמנט הנבחר שלהם לתחילת רשימת האלמנטים הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4366,5 +4391,5 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4374,54 +4399,54 @@ "הממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "מעלה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "העלה את האלמנט הנבחר מקום אחד" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "מטה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "העלה את האלמנטים הנבחרים מקום אחד" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "הסר" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "הקפה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "הקפה את הרשימה הנוכחית של אלמנטים ממוזגים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "הפשר" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4430,5 +4455,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4437,5 +4462,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4444,5 +4469,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4451,5 +4476,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4458,6 +4483,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4466,6 +4491,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4476,5 +4501,5 @@ msgstr "נקודה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4486,5 +4511,5 @@ msgstr "אינדקס טור לא צפוי. התקבל {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4493,19 +4518,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "כן, בטל גם את המחיקה שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "לא, בטל את הפעולה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4514,9 +4539,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "בטל מחיקת נקודות נוספות?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4526,5 +4551,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4548,84 +4573,84 @@ msgstr "קואורדינטות:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(לא כלום)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "מחוק" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "לא נמחק" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "שמור את הקואורדינטות שלי" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "שמור את הקואורדינטות שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4635,17 +4660,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4654,9 +4679,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4671,19 +4696,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<לא מוגדר>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4699,10 +4724,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4712,10 +4737,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4742,27 +4767,27 @@ msgstr "הגרסה שלהם (הנתונים על השרת)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr "<" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4787,22 +4812,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4810,5 +4835,5 @@ msgstr "כלום" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4899,6 +4924,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4909,5 +4934,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4921,21 +4946,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4943,5 +4968,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5028,10 +5053,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5051,17 +5076,17 @@ msgstr "מצבור פקודות: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "פתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5070,25 +5095,25 @@ msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "החל פתרון" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "המשך לפתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5100,13 +5125,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5118,8 +5143,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5186,5 +5211,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5216,34 +5241,34 @@ msgstr "פתח רשימה המכילה את כל השכבות שנטענו." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "מחק את השכבה הנבחרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "הצג/הסתר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "מחליף את המצב החזותי של השכבה הנבחרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "העבר את השכבה הנבחרת שורה אחת מעלה." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "העבר את השכבה הנוכחית שורה אחת מטה." @@ -5253,18 +5278,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "זה ישנה עד עצם {0}" -msgstr[1] "זה ישנה עד {0} עצמים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "ערך ריק מוחק את המפתח." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5273,10 +5297,10 @@ msgstr "<שונה>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "לשנות ערכים?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5285,5 +5309,5 @@ msgstr[1] "שנה תכונות של עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5292,9 +5316,9 @@ msgstr[1] "זה ישנה עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "נא בחר מפתח" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "נא בחר ערך" @@ -5318,102 +5342,98 @@ msgstr "חבר ב" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "הוסף תכונות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "תכונות: {0} \\ חברויות: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "תכונות \\ חברויות" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "שנה יחס" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "מחק מיחס" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "באמת מחק את הבחירה מהיחס {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "מחק את המפתח הנבחר בכל הפריטים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "מחק מאפיינים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "הוסף מצד מפתח/ערך לכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "ערוך מאפיינים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "תכונות: {0} \\ חברויות: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "תכונות \\ חברויות" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "שנה יחס" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "מחק מיחס" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "באמת מחק את הבחירה מהיחס {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "מחק את המפתח הנבחר בכל הפריטים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "מחק מאפיינים" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "יחסים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "פתח רשימה של כל היחסים." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "יחסים: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "פתח עורך עבור היחס הנבחר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "מחק את היחס הנבחר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "צור יחס חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5442,5 +5462,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5452,14 +5472,14 @@ msgstr "בחירה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "\"שחרר\" את הפאנל" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" @@ -5540,12 +5560,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5563,5 +5583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5569,5 +5589,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5575,18 +5595,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5595,14 +5615,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5612,9 +5632,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5624,15 +5644,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5640,5 +5660,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5646,20 +5666,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5668,66 +5688,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5736,9 +5756,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5747,41 +5767,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5791,19 +5811,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "מוריד נתונים" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5824,10 +5851,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5841,5 +5864,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5909,9 +5932,9 @@ msgstr "סימניות" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5920,52 +5943,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "רוחב מזערי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "אורך מזערי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "רוחב מירבי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "אורך מירבי" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5974,52 +5997,52 @@ "כתובת מ www.openstreetmap.org (אתה יכול להדביק כאן כתובת להורדת האיזור)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "מקורות מידע וסוגים" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "נתוני OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "נתוני GPS גולמיים" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "הורדה כשכבה חדשה" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6027,38 +6050,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "הורדת איזור" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "הורד" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "הורדת איזור גדול מידי; כנראה שתדחה ע\"י השרת" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "הורדת איזור בסדר; כנראה שתתקבל ע\"י השרת" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6080,21 +6103,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6833,8 +6856,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7007,5 +7030,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7017,5 +7040,5 @@ msgstr "סוג" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7062,5 +7085,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7074,5 +7097,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7083,5 +7106,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7090,19 +7113,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7112,32 +7135,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7159,5 +7182,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7219,7 +7242,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7249,33 +7272,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "התמקד בבעיה" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "היסטוריה" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7284,7 +7305,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "לא נמחק" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7302,7 +7322,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7342,7 +7361,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "אנונימי" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7370,12 +7388,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "גירסא {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "מחוק" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7433,10 +7450,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7647,5 +7664,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7668,17 +7685,17 @@ msgstr "שכבה" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7694,7 +7711,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7737,29 +7754,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "העלה שינויים" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7767,38 +7784,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7806,16 +7823,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7859,24 +7876,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "תמונות עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "קורא GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "אין זמן לנקודה {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7884,33 +7901,33 @@ msgstr "קורא {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "לא נמצאו תמונות עם חותמות זמין קריאות." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "תמונות בעלות גאותגיות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "התחלת GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "סיום GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "הפרש נוכחי: {0}ש'" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "הפרש אזורי הזמן: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7919,14 +7936,14 @@ msgstr[1] "תמונות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} מתוך הרצועה." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "סנכרן שעון" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7934,32 +7951,32 @@ msgstr "תמונות JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "תמונה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "סנכרן את השעה עם יחידת ה-GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "לא ניתן לנתח את הזמן שהוזן." @@ -8049,5 +8066,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8099,10 +8116,10 @@ msgstr[1] "{0} נקודות דרך" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "המר לשכבת נתונים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8112,11 +8129,11 @@ "מסלולים, ראה כאן:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8126,29 +8143,29 @@ msgstr "המר מ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "הורד הכל עם:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} מטרים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "שטח מירבי לבקשה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} קמ\"ר" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8159,9 +8176,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8169,5 +8186,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8177,23 +8194,23 @@ "באופן הגיוני הושמטו." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "שכבת נתונים {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "גירסה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8202,5 +8219,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8214,5 +8231,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8225,11 +8242,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8238,22 +8255,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "גירסת API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "אף דרך \"from\" לא נמצאה." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8348,9 +8378,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "הצג\\הסתר טקסט\\סמלים" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8412,5 +8442,5 @@ msgstr "ערכי ברירת מחדל לא ידועים ברגע זה (קביעה לא היתה עדיין בשימוש)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8418,5 +8448,5 @@ msgstr "נא בחר את השורה לעריכה." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8424,5 +8454,5 @@ msgstr "ערך חדש עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8431,5 +8461,5 @@ msgstr "נא בחר את השורה למחיקה." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "הכנס צמד מפתח\\ערך חדש" @@ -8552,40 +8582,40 @@ msgstr "כיול רשם קול" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "צבע" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "סגנון ציור {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "בחר" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "בחר צבע עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "צבעים בשימוש עצמים אחרים ב JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "צבעים" @@ -9016,17 +9046,17 @@ msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "הצג קורדינטות כ" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "שיטת הטלה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9036,5 +9066,5 @@ msgstr "הטלת מפה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9092,81 +9122,81 @@ msgstr "קיצור-דרך" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9175,6 +9205,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9340,10 +9370,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9353,13 +9383,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9367,18 +9397,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "מאפייני רשות:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "סוג לא ידוע: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9389,15 +9419,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "שגיאה בניתוח {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9407,18 +9437,18 @@ msgstr[1] "שנה {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "כלום לא נבחר!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "שנה תכונות" @@ -9434,6 +9464,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9442,8 +9472,21 @@ msgstr "מתחבר לשרת OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "מוריד נקודות {0} עד {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9558,11 +9601,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9572,40 +9615,40 @@ msgstr "מוריד מידע של OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9668,5 +9711,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9679,66 +9722,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "מכין..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "מעלה..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9773,5 +9816,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9798,5 +9841,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9804,5 +9847,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9815,5 +9858,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9964,5 +10007,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9971,38 +10014,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10010,19 +10053,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "עצם לא חוקי עם id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10032,10 +10075,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10045,25 +10086,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10519,5 +10560,5 @@ msgstr "(הטקסט כבר הועתק ל-clipboard שלך)." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10526,12 +10567,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10541,5 +10575,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10549,10 +10583,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10561,5 +10590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10568,5 +10597,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10575,9 +10604,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10587,5 +10623,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10594,5 +10630,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10601,5 +10637,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10608,10 +10644,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10620,10 +10656,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10634,5 +10670,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10642,5 +10678,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11362,5 +11398,5 @@ msgstr "שגיאה בקובץ {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11373,28 +11409,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "שגיאה בטעינת קובץ" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11424,13 +11477,13 @@ msgstr "בחר מ..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11439,13 +11492,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11725,43 +11778,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "שנה מיקום" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "קבע מיקום חדש לבקשה הבאה" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "הוסף שכבה חדשה" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "מיקום" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11769,5 +11827,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11798,5 +11856,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "התאם WMS" @@ -11824,5 +11882,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11830,28 +11888,28 @@ msgstr "שכבה ריקה" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11860,24 +11918,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12909,20 +12958,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "האם אתה רוצה לאשר את זה?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "אשר פעולת שלט רחוק" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:" @@ -13044,13 +13093,9 @@ msgstr "הקטן" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13622,6 +13667,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "קו חוף" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14264,12 +14310,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "הורד" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "הורד נתוני מפה משרת ה-OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14307,7 +14351,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "מוריד נקודות כפולות..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14373,29 +14416,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14404,5 +14447,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14410,10 +14453,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14426,24 +14469,24 @@ msgstr "הורדה אוטומטית" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14454,57 +14497,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "הורד משטחים גלויים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "שנה רזולוציה" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "טען מחדש משטחים פגומים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "שמור שכבת WMS לקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "טען שכבת WMS מקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "שגיאה בפורמט קובץ" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "סימניות" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26816,8 +26864,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "צירוף תגיות לא רגיל" @@ -26837,34 +26884,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26874,9 +26910,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26890,28 +26929,73 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "No earliest version found. History is empty." -#~ msgstr "לא נמצאה גירסה מוקדמת. ההיסטוריה ריקה." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה." - -#~ msgid "help" -#~ msgstr "עזרה" - -#~ msgid "Help / About" -#~ msgstr "עזרה \\ אודות" - -#~ msgid "WMS Plugin Help" -#~ msgstr "עזרת תוסף WMS" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Edit Properties" +#~ msgstr "ערוך מאפיינים" #~ msgid "Move" @@ -27108,4 +27192,13 @@ #~ msgid "different" #~ msgstr "שונה" + +#~ msgid "WMS Plugin Help" +#~ msgstr "עזרת תוסף WMS" + +#~ msgid "Help / About" +#~ msgstr "עזרה \\ אודות" + +#~ msgid "help" +#~ msgstr "עזרה" #~ msgid "Please select the row to copy." @@ -27351,2 +27444,8 @@ #~ msgid "Unexpected return value. Got {0}." #~ msgstr "ערך מוחזר לא צפוי. התקבל {0}" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "לא נמצאה גירסה מוקדמת. ההיסטוריה ריקה." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה." Index: applications/editors/josm/i18n/po/is.po =================================================================== --- applications/editors/josm/i18n/po/is.po (revision 18772) +++ applications/editors/josm/i18n/po/is.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-16 14:58+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-22 15:25+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjálp" +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#, java-format +msgid "Ignoring malformed URL: \"{0}\"" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:431 -#, java-format -msgid "Ignoring malformed URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,11 +92,20 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Aðvörun" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Villa" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -302,5 +303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -309,27 +310,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -347,5 +348,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Hætta við" @@ -356,19 +357,19 @@ "Þú verður að velja hnút, veg eða vensl sem hefur verið hlaðið upp nú þegar." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Veldu lag til að sameina þessu lagi." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Veldu lag til að sameina" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Sameina" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -377,5 +378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -488,13 +489,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -592,20 +593,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Skrá: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Þú átt engin opin breytingarsett" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Engin opin breytingarsett" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -645,10 +646,10 @@ "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Sameina {0} vegi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." @@ -692,10 +693,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -714,11 +715,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Yfirskrifa" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Þessi skrá er þegar til. Yfirskrifa hana?" @@ -765,5 +766,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -772,6 +773,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -787,7 +788,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -815,5 +815,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Tvöfalda" @@ -837,30 +837,30 @@ msgstr "Hætta í forritinu." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Vista sem GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Vista gögnin í GPX sniði." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Ekkert til að vista. Opnaðu gögn fyrst." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -868,13 +868,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -893,8 +893,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -902,7 +902,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -925,9 +925,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -939,5 +939,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -945,5 +945,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "" @@ -1089,6 +1089,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Ný" @@ -1217,5 +1217,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Líma" @@ -1303,11 +1303,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Vista" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Vista þau gögn sem sjást núna." @@ -1362,10 +1362,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Vista sem..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Vista þau gögn sem sjást núna í nýja skrá." @@ -1382,10 +1382,10 @@ msgstr "Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Sýna stöðuskýrslu" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1393,20 +1393,20 @@ "villutilkynningar" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Stöðuskýrsla" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Afrita á klemmuborðið og loka" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1566,5 +1566,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1572,5 +1572,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1608,64 +1608,61 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 msgid "Update data" -msgstr "" +msgstr "Uppfæra gögn" #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 msgid "Updates the objects in the active data layer from the server." -msgstr "" +msgstr "Uppfærir hluti í núverandi lagi frá þjóninum." #. bounds defined? => use the bbox downloader #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Uppfæra val" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Uppfæra val" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Afrita valda hluti á klemmuborðið." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "búa til nýja hluti" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1674,5 +1671,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1680,29 +1677,29 @@ msgstr "Engar breytingar til að hlaða upp" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1716,11 +1713,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1731,5 +1728,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1739,22 +1736,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1765,19 +1762,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1786,5 +1783,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1793,15 +1790,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1913,17 +1910,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Sæki GPS gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Niðurhöluð GPX gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Sæki gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1931,5 +1928,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "Engin gögn fundust á þessu svæði." @@ -1983,9 +1980,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2003,5 +2000,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2009,5 +2006,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2123,5 +2120,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2141,17 +2138,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "Færa þá" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Ekki færa þá" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2161,22 +2158,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2184,15 +2181,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Þysja" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Þysja og hliðra korti" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2200,10 +2197,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Leita..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2212,42 +2209,41 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Sláðu inn leitarstreng" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regluleg segð" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "skipta út vali" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "bæta við val" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "fjarlæga úr vali" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regluleg segð" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -2255,18 +2251,18 @@ "gildi." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Gamla Hringbraut\" - „Gamla Hringbraut“ í einhverjum lykli og gildi." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Gamla Hringbraut\" - „Gamla Hringbraut“ í einhverjum lykli og gildi." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Gam - „Gam“ kemur fyrir í nafninu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - lykilinn „type“ með gildið „route“." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2276,17 +2272,17 @@ "*=gildi, type=, *=* og *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Gam - „Gam“ kemur ekki fyrir í nafninu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - Lykillinn „foot“ með eitthvað gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Sérleitir:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" @@ -2295,17 +2291,17 @@ "fyrir hnút, veg og vensl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - Hlutir sem breytt hefur verið af gefnum notanda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - hlutur með þessa kennitölu (0 fyrir nýja hluti)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2313,35 +2309,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - Hlutum sem breytt hefur verið" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - Valdir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - Ókláraðir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - Hlutir án eiginda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" msgstr "child segð - allir undirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent segð - allir yfirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "Notaðu | eða OR t.d. „A | B“ til að leita að A eða B" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2349,9 +2345,9 @@ "„:“ eða „ “" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Notaðu ( og ) til að sameina segðir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2361,51 +2357,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Hefja leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "stafsetursónæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "" @@ -2419,14 +2415,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2435,26 +2431,26 @@ "hnút, veg og vensl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2463,9 +2459,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2474,5 +2470,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2570,7 +2566,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2680,5 +2676,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2703,5 +2699,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2709,6 +2705,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2778,17 +2774,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2822,10 +2808,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2858,20 +2844,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2893,10 +2879,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2938,5 +2924,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "" @@ -2992,10 +2978,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3004,5 +2990,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3011,5 +2997,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3018,5 +3004,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3025,5 +3011,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3031,5 +3017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3038,5 +3024,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3045,5 +3031,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3052,5 +3038,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3059,10 +3045,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3143,25 +3129,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "A" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3169,5 +3155,5 @@ msgstr "Breytingarsett {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3175,5 +3161,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3183,26 +3169,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3211,5 +3197,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3272,24 +3258,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3297,5 +3283,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3323,10 +3309,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3491,10 +3477,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Villa: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3506,6 +3492,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3515,5 +3501,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3523,6 +3509,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3540,6 +3526,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "bakgrunnur" @@ -3557,19 +3543,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3583,26 +3585,51 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3617,10 +3644,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Ekki sýna þessi skilaboð aftur" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3628,32 +3655,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "óklárað" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vatnsfarvegur" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3662,5 +3689,5 @@ msgstr[1] "{0} hnútar" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3698,6 +3725,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Árekstrar" @@ -3707,11 +3734,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3907,11 +3934,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4026,5 +4053,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4032,18 +4059,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(enginn hlutur)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4164,67 +4191,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Tögg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Hnútar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Stök" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4232,68 +4259,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4301,5 +4328,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4307,30 +4334,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4338,5 +4365,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4344,14 +4371,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4359,5 +4386,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4365,54 +4392,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Fjarlægja" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4421,5 +4448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4428,5 +4455,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4435,5 +4462,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4442,5 +4469,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4449,6 +4476,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4457,6 +4484,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4467,5 +4494,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4477,5 +4504,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4484,19 +4511,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4505,9 +4532,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4517,5 +4544,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4539,84 +4566,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4626,17 +4653,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4645,9 +4672,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4662,19 +4689,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<óskilgreint>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4690,10 +4717,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4703,10 +4730,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4733,27 +4760,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4778,22 +4805,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4801,5 +4828,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4890,6 +4917,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4900,5 +4927,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4912,21 +4939,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4934,5 +4961,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Hlutverk:" @@ -5019,10 +5046,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5042,17 +5069,17 @@ msgstr "Skipanasaga: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Leysa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5061,25 +5088,25 @@ msgstr "Henda hlutum út úr vallistanum sem eru ekki valdir á honum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5091,13 +5118,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5109,8 +5136,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5177,5 +5204,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5207,34 +5234,34 @@ msgstr "Sýna lista yfir öll lög." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Eyða völdu lagi." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Sýna/Fela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Sýna eða fela valið lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Virkja valið lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Sameina þetta lag öðru lagi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Færa valið lag upp í röðinni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Færa valið lag niður í röðinni" @@ -5244,18 +5271,17 @@ msgstr "Upplýsingar um lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Allt að {0} hluti verður breytt." -msgstr[1] "Allt að {0} hlutum verður breytt." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Tómt gildi eyðir lyklinum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5264,10 +5290,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Breyta eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5276,5 +5302,5 @@ msgstr[1] "Breyta eigindum allt að {0} hluta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5283,9 +5309,9 @@ msgstr[1] "Allt að {0} hlutum verður breytt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Veldu lykil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Veldu gildi" @@ -5309,102 +5335,98 @@ msgstr "Stak í" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Bæti vað eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "{0} eigindi & {1} vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Eigindi & vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Breyta venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Fjarlægja úr venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Eyða valinu úr venslunum {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Eyða völdum lykil í öllum völdum hlutum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Eyða eigindum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Bæta nýjum eigindum við valda hluti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Breyta eigindum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Breyta gildi valins lykils í öllum völdum hlutum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "{0} eigindi & {1} vensl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Eigindi & vensl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Breyta venslum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Fjarlægja úr venslum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Eyða valinu úr venslunum {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Eyða völdum lykil í öllum völdum hlutum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Eyða eigindum" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Sýna lista yfir vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Vensl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Opna ritil til að breyta völdum venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Eyða völdum venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Skapa ný vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5433,5 +5455,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5443,9 +5465,9 @@ msgstr "Val: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Opna þessa stiku sem glugga" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5454,5 +5476,5 @@ "vinstri tólastikunni." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Smelltu til að minnka/hámarka innihald stikunnar" @@ -5533,12 +5555,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5558,5 +5580,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5564,5 +5586,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5570,18 +5592,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Stök og tögg þeirra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Yfirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Undirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5590,14 +5612,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5610,9 +5632,9 @@ "þennan hlut?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Mörg stök benda á sama hlutinn" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5622,15 +5644,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5638,5 +5660,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5644,20 +5666,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5666,66 +5688,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "Bæta völdum stökum á vallistann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Raða stöknum" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Færa valda meðlimi upp" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Færa valda meðlimi niður" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Fjarlægja völd stök úr þessum venslum" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5734,9 +5756,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5745,41 +5767,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Bæta við tómu taggi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Hala niður öllum nóðum og vegum í þessum venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Niðurhala meðlimum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Vistar hlutverk fyrir völd stök" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Vista hlutverk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5789,20 +5811,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "Breyta venslunum sem valið stak bendir á" +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Sæki viðbótina {0}..." + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 msgid "Zoom to" @@ -5811,7 +5840,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "Breyta venslunum sem valið stak bendir á" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -5823,10 +5851,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5840,5 +5864,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5908,9 +5932,9 @@ msgstr "Bókamerki" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5919,52 +5943,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "Minnsta breiddargráða" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "Minnsta lengdargráða" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "Mesta breiddargráða" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "Mesta lengdargráða" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5974,52 +5998,52 @@ "svæðinu)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Afmarkað svæði" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Gagnabankar" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap gögn" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "GPS gögn" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Sækja sem nýtt lag" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6027,38 +6051,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Niðurhalssvæði" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Niðurhala" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Niðurhalssvæði er of stórt. Verður sennilega hafnað af þjóni" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Stærð niðurhalssvæðis er ok, stærð sennilega ásættanleg fyrir þjón" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6080,21 +6104,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Núll bendill, hugsanlega vantar eigindi." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6833,8 +6857,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7007,5 +7031,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7017,5 +7041,5 @@ msgstr "Gerð" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7062,5 +7086,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7074,5 +7098,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7083,5 +7107,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7090,19 +7114,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7112,32 +7136,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7159,5 +7183,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7249,33 +7273,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Hnútur {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Þysja að vandamálinu" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "sagnfræði" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7301,7 +7323,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7341,7 +7362,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Nafnlaust" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7369,17 +7389,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Útgáfa {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "Fjarlægja" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Útgáfa {0} búin til {1} af {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7432,10 +7451,10 @@ msgstr "Loka breytingarsetti {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Velja skráarnafn" @@ -7646,5 +7665,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7667,17 +7686,17 @@ msgstr "Lag" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Ætti að upphala?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Ætti að vista?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Skráarnafn" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7693,7 +7712,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Tögg fyrir nýtt breytingarsett" @@ -7736,29 +7755,29 @@ msgstr[1] "{0} hlutum verður eytt:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Hlaða upp breytingum" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Hlaða upp þessari breytingu" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Hætta við að hala upp og halda áfrám að breyta" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Upphala öllum breytingunum í einni fyrirspurn" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7768,33 +7787,33 @@ "ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Opna nýtt breytingarsett" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Nota opið breytingarsett" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Bæta gögnunum við breytingarsett sem er þegar opið á þjóninum" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Loka breytingarsettinu eftir að breytingunni hefur verið halið upp" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" @@ -7802,6 +7821,6 @@ "breytingunum. Ekki verður hægt að bæta frekari gögnum við það." -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7809,16 +7828,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Niðurhala lista yfir opin breytingarsett frá þjóninum" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Loka breytingarsettinu sem nú er valið" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7866,24 +7885,24 @@ msgstr "Halda áfrám ad hlaða upp" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7891,33 +7910,33 @@ msgstr "Les {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 +#, java-format +msgid "GPS start: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 +#, java-format +msgid "GPS end: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format -msgid "GPS start: {0}" +msgid "current delta: {0}s" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 -#, java-format -msgid "GPS end: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 -#, java-format -msgid "current delta: {0}s" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 msgid "timezone difference: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7926,14 +7945,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Samstilla klukkur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7941,32 +7960,32 @@ msgstr "JPEG myndir (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 +msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 -msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "" @@ -8056,5 +8075,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8106,10 +8125,10 @@ msgstr[1] "{0} punktar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Breyta í gagnalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8117,11 +8136,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8131,29 +8150,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8162,9 +8181,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8172,5 +8191,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8178,23 +8197,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Gagnalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8203,5 +8222,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8215,5 +8234,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8226,11 +8245,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8239,22 +8258,34 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "Tölfræði um {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API útgáfa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Breyta í GPX-lag" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8349,9 +8380,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Sýna/Fela texta og táknmyndir" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8413,5 +8444,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8419,5 +8450,5 @@ msgstr "Veldu hlut til að breyta fyrst." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8425,5 +8456,5 @@ msgstr "Nýtt gildi fyrir {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8432,5 +8463,5 @@ msgstr "Veldu hlut til að eyða fyrst." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Bættu við nýjum eigindum" @@ -8553,40 +8584,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Litur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Velja lit" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Veldu lit fyrir „{0}“" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Litir" @@ -9022,17 +9053,17 @@ "Athugið að stundum þarf að endurræsa JOSM til að stillingar taki gildi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Sýna hnit sem" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Vörpun" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9042,5 +9073,5 @@ msgstr "Kortavörpun" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9098,81 +9129,81 @@ msgstr "Flýtileið" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9181,6 +9212,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9346,10 +9377,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9359,13 +9390,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Bæta við nýju taggi" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Eyða völdum hlutum úr listanum yfir tögg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9373,18 +9404,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Valfrjáls eigind:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9395,15 +9426,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9413,18 +9444,18 @@ msgstr[1] "Breyta {0} hlutum" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Breyta eigindum" @@ -9440,6 +9471,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9448,8 +9479,21 @@ msgstr "Hef samband við OpenStreetMap miðlara..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Hala niður punktum {0} til {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9562,11 +9606,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9576,40 +9620,40 @@ msgstr "Hala niður OSM gögnum..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9672,5 +9716,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9683,66 +9727,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Bý til breytingarsett..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Opnaði breytingarsett {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Uppfæri breytingarsett.." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Uppfæri breytingarsett {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Loka breytingasetti..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Undirbý..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Hleð upp gögnum..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9777,5 +9821,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9802,5 +9846,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9808,5 +9852,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9819,5 +9863,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9969,5 +10013,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9976,38 +10020,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10015,19 +10059,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Ógildur hlutur með kenni=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10037,10 +10081,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10050,25 +10092,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10529,5 +10571,5 @@ msgstr "Textinn hefur verið þegar verið afritaður" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10536,12 +10578,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10551,5 +10586,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10559,10 +10594,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10571,5 +10601,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10578,5 +10608,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10585,9 +10615,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10597,5 +10634,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10604,5 +10641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10611,5 +10648,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10618,10 +10655,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10630,10 +10667,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10644,5 +10681,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10652,5 +10689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11364,5 +11401,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11375,28 +11412,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11426,13 +11480,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11441,13 +11495,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11727,43 +11781,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Bæta við nýju lagi" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11771,5 +11830,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11800,5 +11859,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11826,5 +11885,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11832,28 +11891,28 @@ msgstr "Tómt lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11862,24 +11921,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12905,20 +12955,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13040,13 +13090,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13617,6 +13663,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "strandlengja" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14257,12 +14304,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Niðurhala" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Niðurhala kortagögnum frá OSM þjóninum." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14300,7 +14345,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Hnútur endurtekinn í vegi" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14366,29 +14410,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14397,5 +14441,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14403,10 +14447,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14419,24 +14463,24 @@ msgstr "Sjálfvirkt niðurhal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14447,57 +14491,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Vista WMS lag í skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Hlaða WMS lag úr skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Bókamerki" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26807,8 +26856,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26828,34 +26876,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26865,9 +26902,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26881,13 +26921,73 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Edit Properties" +#~ msgstr "Breyta eigindum" #~ msgid "Unsaved Changes" Index: applications/editors/josm/i18n/po/it.po =================================================================== --- applications/editors/josm/i18n/po/it.po (revision 18772) +++ applications/editors/josm/i18n/po/it.po (revision 18773) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-11 16:14+0000\n" -"Last-Translator: Davide Prade \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-20 08:45+0000\n" +"Last-Translator: David Paleino \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -24,20 +24,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Aiuto" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorato un indirizzo URL malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -58,21 +58,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -80,6 +78,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -91,12 +89,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Attenzione" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Impossibile leggere il file ''{0}''.
Errore:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -104,17 +111,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Impossibile leggere il file ''{0}''.
Errore:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -122,8 +120,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -133,21 +131,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -171,8 +169,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -185,6 +186,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Errore" @@ -205,6 +206,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -307,5 +308,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -314,27 +315,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -352,5 +353,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Annulla" @@ -360,19 +361,19 @@ msgstr "Selezionare almeno un nodo, percorso o relazione già caricato." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Selezionare il livello di riferimento." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Seleziona il livello di riferimento." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Unisci" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -382,5 +383,5 @@ "Non ci sono livelli al quale unire il livello sorgente ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Nessun livello di riferimento" @@ -493,13 +494,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -597,20 +598,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Non ci sono gruppi di modifiche aperti" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Nessun gruppo di modifiche aperto" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -650,10 +651,10 @@ "di nodi)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Unisci {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Selezionare almeno due percorsi da unire." @@ -699,10 +700,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -721,11 +722,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Sovrascrivi" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Il file esiste. Sovrascriverlo?" @@ -774,5 +775,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -781,6 +782,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -796,7 +797,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -824,5 +824,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplica" @@ -846,30 +846,30 @@ msgstr "Esci dall'applicazione." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Tutti i formati" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Esporta in GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Esporta i dati in un file GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Niente da esportare. Prima è necessario ottenere dei dati." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -877,13 +877,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -902,8 +902,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -911,7 +911,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -934,9 +934,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -948,5 +948,5 @@ msgstr "il parametro ''{0}'' non deve essere nullo" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -954,5 +954,5 @@ msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Esporta file GPX" @@ -1102,6 +1102,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nuovo" @@ -1237,5 +1237,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Incolla" @@ -1323,11 +1323,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Salva" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Salva i dati attuali." @@ -1384,10 +1384,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Salva come..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Salva i dati correnti su un nuovo file." @@ -1406,10 +1406,10 @@ "oggetti incompleti." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Visualizza il rapporto dello stato" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1417,20 +1417,20 @@ "essere allegate agli errori" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Aiuto: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Rapporto dello stato" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Copia negli appunti e chiudi" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1603,5 +1603,5 @@ msgstr "Nodo staccato" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1609,5 +1609,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1654,13 +1654,13 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Scarica dati" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Non è stato trovato nessun dataset corrente" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" @@ -1668,10 +1668,9 @@ "Nell''insieme di dati corrente non è stato trovato un oggetto con id {0}" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Aggiorna le selezioni" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Aggiorna selezione" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1680,33 +1679,31 @@ "(scarica nuovamente i dati)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Aggiorna la selezione" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Selezione vuota" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Elimina oggetti" - +msgstr "Aggiorna oggetti" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Carica dati" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" "Carica tutte le modifiche presenti nel livello dei dati attivo sul server OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1717,5 +1714,5 @@ "necessario risolvere prima questi." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1723,29 +1720,29 @@ msgstr "Nessun cambiamento da caricare." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Niente da caricare. Prima è necessario ottenere dei dati." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Sincronizza solo il nodo {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Sincronizza solo il percorso {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Sincronizza solo la relazione {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Sincronizza l'intero dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1768,11 +1765,11 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Rilevati conflitti" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1788,5 +1785,5 @@ "continuare ad apportare delle modifiche.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1799,22 +1796,22 @@ "nuovamente con un gruppo di modifiche nuovo o esistente aperto." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Gruppo di modifiche chiuso" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "Prepara la risoluzione dei conflitti" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "Cliccare per scaricare tutti i percorsi da cui dipende il nodo {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "Cliccare per annullare e per ritornare alla modifica della mappa" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1830,10 +1827,10 @@ "risolti nella relativa finestra." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "Nodo ancora in uso" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" @@ -1842,9 +1839,9 @@ "atteso" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Aggiornamento della primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1853,5 +1850,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1862,5 +1859,5 @@ "questo oggetto e riprovo a caricare." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." @@ -1869,10 +1866,10 @@ "caricamento." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "Caricamento di {0} oggetti ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1986,17 +1983,17 @@ msgstr "Avanzamento lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Scaricamento dei dati GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Scarica dati GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Scaricamento dei dati" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -2006,5 +2003,5 @@ "Eccezione: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "Non è stato trovato alcun dato in quest'area." @@ -2067,9 +2064,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Errori durante lo scaricamento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "Errore durante lo scaricamento" @@ -2087,5 +2084,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2093,5 +2090,5 @@ msgstr "Modalità: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2189,23 +2186,18 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 +msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Disegna un rettangolo della grandezza desiderata, poi rilascia il bottone " "del mouse." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Disegna un rettangolo della grandezza desiderata, poi rilascia il bottone " -"del mouse." - #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." msgstr "" -"Trascina il segmento un segmento di un percorso per disegnare un rettangolo." #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2221,5 +2213,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2239,17 +2231,17 @@ msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Muovi elementi" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Muoverli" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Annullare lo spostamento" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2262,9 +2254,9 @@ "Si vuole veramente spostarli?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Sposta sempre e non visualizzare più la finestra di dialogo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" @@ -2272,5 +2264,5 @@ "rettangolo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2279,9 +2271,9 @@ "più vicino." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Rilascia il bottone del mouse per interrompere la rotazione." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2292,15 +2284,15 @@ "la selezione" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Ridimensiona e muovi la mappa" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2311,10 +2303,10 @@ "di ingrandimento con il tasto destro" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Cerca..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2323,61 +2315,60 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Inserire una stringa di filtro." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Inserire una stringa di ricerca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "espressione regolare" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "Sostituisci la selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "Aggiungi alla selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "Rimuovi dalla selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "cerca nella selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "Distingui maiuscole" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "espressione regolare" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Via Nazionale - ''Via'' e ''Nazionale'' in qualunque chiave o nome." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Via Nazionale - ''Via'' e ''Nazionale'' in qualunque chiave o nome." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Via Nazionale\" - ''Via Nazionale'' in qualunque chiave o nome." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Via Nazionale\" - ''Via Nazionale'' in qualunque chiave o nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Naz - ''Naz'' in qualunque punto del nome." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" +"type=route - chiave 'type' che contiene esattamente il valore 'route'." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" -"type=route - chiave 'type' che contiene esattamente il valore 'route'." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2387,35 +2378,35 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Naz - ''Naz'' non presente all''interno del nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - chiave=foot impostata con qualunque valore." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Ricerche speciali:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - tipo dell''oggetto (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - tipo dell''oggetto (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - tutti gli oggetti modificati dall''utente" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - oggetto con un dato ID (0 per nuovi oggetti)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - oggetto con un dato numero di nodi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2425,21 +2416,21 @@ "etichette:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - tutti gli oggetti modificati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - tutti gli oggetti selezionati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - tutti gli oggetti incompleti" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - tutti gli oggetti provi di proprietà" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" @@ -2448,5 +2439,5 @@ "corrispondenti all'espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" @@ -2455,5 +2446,5 @@ "oggetti corrispondenti all'espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2461,5 +2452,5 @@ "logico ''or''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2467,9 +2458,9 @@ "contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Utilizzare ( e ) per raggruppare le espressioni" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2479,33 +2470,33 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Cerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Invia filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Inizia Ricerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Nessuna corrispondenza trovata per ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" @@ -2513,18 +2504,18 @@ "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Trovate {0} corrispondenze" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2542,5 +2533,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2548,10 +2539,10 @@ "etichetta. Esempio di utilizzo: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2560,26 +2551,26 @@ "relazione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Token inaspettato: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Argomenti mancanti per l'operatore booleano OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Argomento mancante per l'operatore booleano NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Era attesa una parentesi chiusa." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "Numero errato di parametri per l'operatore tags." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2590,9 +2581,9 @@ "il numero di etichette o un intervallo, per esempio tags:1 oppure tags:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Numero errato di parametri per operatore sui nodi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2603,5 +2594,5 @@ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2710,7 +2701,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2822,5 +2813,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Doppio conflitto" @@ -2849,5 +2840,5 @@ "presente" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2855,6 +2846,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "Impossibile risolvere il conflitto irrisolto" @@ -2867,8 +2858,6 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60 -#, fuzzy msgid "At least one object to delete required, got empty collection" msgstr "" -"E' richiesto almeno un oggetto da eliminare, ottenuta una collezione vuota" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106 @@ -2927,18 +2916,8 @@ msgstr "Conferma di cancellazione" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Risolvi conflitti nello stato eliminato in {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2973,10 +2952,10 @@ msgstr "Rimozione del riferimento dalla relazione {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Risolvi conflitti nella lista dei membri della relazione {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -3012,20 +2991,20 @@ msgstr "Sequenza" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Risolvi {0} conflitti di etichette nel nodo {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Risolvi {0} conflitti di etichette nel percorso {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Risolvi {0} conflitti di etichette nella relazione {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -3047,10 +3026,10 @@ msgstr "Risolvi i conflitti di versione per la relazione {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Risolvi i conflitti nella lista dei nodi del percorso {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3095,5 +3074,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nuovo valore" @@ -3142,7 +3121,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3151,10 +3130,10 @@ msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Errore di formato nel file di configurazione alla linea {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3165,5 +3144,5 @@ "delle preferenze ''{0}'' non è in realtà una cartella." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3174,5 +3153,5 @@ "preferenze ''{0}'' non è in realtà una cartella." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3183,5 +3162,5 @@ "possibile creare la cartella delle preferenze mancante: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3192,5 +3171,5 @@ "creare la cartella delle preferenze mancante: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3200,5 +3179,5 @@ "file di preferenze predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3209,5 +3188,5 @@ "file predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3218,5 +3197,5 @@ "reimpostare il file delle preferenze con uno predefinito: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3228,5 +3207,5 @@ "predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3237,5 +3216,5 @@ "possibile reimpostare il file delle preferenze con uno predefinito: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" @@ -3243,5 +3222,5 @@ "Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3332,25 +3311,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3358,5 +3337,5 @@ msgstr "Gruppo di modifiche {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3366,5 +3345,5 @@ "incluso" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3378,26 +3357,26 @@ "continuare a lavorare senza problemi." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Argomento mancante per l'operatore booleano NOT." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "Storico per la relazione {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3406,6 +3385,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3413,7 +3392,4 @@ "Keeping target object. " msgstr "" -"La mia primitiva con id {0} e versione {1} è visibile sebbene la loro " -"primitiva con versione minore {2} non lo sia. Non si può sopperire a questa " -"inconsistenza. Verrà mantenuta la mia primitiva. " #. translators notes must be in front @@ -3470,24 +3446,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Era atteso ID >= 0. Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "Una primitiva con ID = 0 non può essere invisibile." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "Era atteso un ID > 0 . Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "attesa versione > 0 . Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3495,5 +3471,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3523,10 +3499,10 @@ "ci sono chiavi con valori multipli." -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3537,7 +3513,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3558,9 +3534,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." msgstr "" -"Impossibile confrontare la primitiva avente ID ''{0}'' con la primitiva " -"avente ID ''{1}''." #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3695,10 +3669,10 @@ msgstr "testo dell''area" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Errore: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3710,6 +3684,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3719,5 +3693,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3727,6 +3701,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3744,6 +3718,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "sfondo" @@ -3761,24 +3735,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"IMPORTANTE: dati posizionati lontano dai limiti\n" -"della zona di Lambert attualmente usata.\n" -"Non caricare nessun dato dopo questo messaggio.\n" -"Annulla l'ultima operazione, salva il tuo lavoro\n" -"e crea un nuovo layer sulla nuova zona." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "Zona di Lambert 4 (Francia)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Zona di Lambert" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "Zona di Lambert CC9 (Francia)" @@ -3792,27 +3778,56 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zona UTM" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Grigliato svizzero (Svizzera)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "Zona UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3828,10 +3843,10 @@ msgstr "Impossibile scrivere il segnalibro.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Non mostrare di nuovo" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3839,32 +3854,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "strada" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "ferrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "corso d'acqua" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "tipologia di area" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3873,5 +3888,5 @@ msgstr[1] "{0} nodi" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3909,6 +3924,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflitto" @@ -3918,11 +3933,11 @@ msgstr "Host sconosciuto" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Oggetto eliminato" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4133,11 +4148,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4252,5 +4267,5 @@ msgstr "Lunghezza del segmento di percorso che si sta disegnando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4261,18 +4276,18 @@ "mouse.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(nessun oggetto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Utente:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "livello non in lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4402,50 +4417,50 @@ msgstr "il ruolo {0} non partecipa nella comparazione {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Proprietà" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Etichette" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Nodi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Membri" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Non c'è alcun conflitto di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Etichette({0} conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} conflitti di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Nodi(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4454,17 +4469,17 @@ "c'è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Nodi(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Conflitti in attesa nella lista di nodi di questo percorso" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Membri(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4474,64 +4489,64 @@ "non c'è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Membri(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitti in attesa nella lista di membri di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Non c'è alcun conflitto di proprietà in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Proprietà(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Conflitti di proprietà in attesa di essere risolti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Risoluzione conflitto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "parametro attualmente fuori scala: ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "elemento {0} non trovato nella lista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "blocca scorrimento" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Confronta " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Versione personale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" @@ -4539,5 +4554,5 @@ "locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4545,5 +4560,5 @@ msgstr "Versione unita" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4553,10 +4568,10 @@ "appena saranno applicate le decisioni sull'unione." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "La loro versione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" @@ -4564,18 +4579,18 @@ "server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> inizio" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" "Copia i nodi personali selezionati all'inizio della lista dei nodi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> fine" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4583,5 +4598,5 @@ "elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4591,5 +4606,5 @@ "selezionato nella lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4599,5 +4614,5 @@ "nella lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4606,10 +4621,10 @@ "uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Copia i loro elementi selezionati alla fine della lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4619,5 +4634,5 @@ "lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4627,54 +4642,54 @@ "lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Su" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Sposta in su gli elementi selezionati di una posizione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Giù" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Sposta in giù le voci selezionate di una posizione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Elimina" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Elimina le voci selezionate dalla lista degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Blocca" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Blocca la lista attuale degli elementi uniti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Sblocca" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Sblocca la lista degli elementi uniti ed inizia l'unione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4685,5 +4700,5 @@ "personali e le loro" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4694,5 +4709,5 @@ "personali e le loro" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4701,5 +4716,5 @@ msgstr[1] "Versione personale ({0} voci)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4708,5 +4723,5 @@ msgstr[1] "Versione unita ({0} voci)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4715,6 +4730,6 @@ msgstr[1] "Loro versione ({0} voci)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4725,6 +4740,6 @@ "partecipazione nella variazione sincronizzata." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4735,5 +4750,5 @@ msgstr "Nodo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4747,5 +4762,5 @@ msgstr "indice di colonna non atteso. Ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4756,19 +4771,19 @@ "server
Dettagli: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Comunicazione con il server fallita" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Si, ripristina anche questo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "No, annulla l'operazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4779,9 +4794,9 @@ "cancellati sul server.

Vuoi recuperare anche questi nodi?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Ripristina i nodi addizionali?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4793,5 +4808,5 @@ "sono state eliminate sul server.

Si desidera ripristinarle?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Ripristina le primitive dipendenti?" @@ -4818,84 +4833,84 @@ msgstr "Coordinate:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Stato eliminato:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Stato visibile:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(nessuno/a)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "cancellato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "non eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "visibile (sul server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "non visibile (sul server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Mantieni un clone della versione locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Elimina fisicamente dall'insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Mantieni le mie coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Mantieni le loro coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Marca come irrisolto il conflitto tra coordinate differenti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Mantieni il mio stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Mantieni il loro stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Marca come irrisolto il conflitto tra stati eliminati" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Mantieni il mio stato visibile" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Si, reimposta l'id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "No, annulla" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4908,17 +4923,17 @@ "server le assegnerà
un nuovo identificativo.
Si è d''accordo?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Reimposta l'id a 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Mantieni il loro stato visibile" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Si, elimina" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4929,9 +4944,9 @@ "
dall'insieme di dati.
Si è d'accordo?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Elimina dall'insieme di dati" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Conflitto irrisolto tra stati di visibilità" @@ -4948,19 +4963,19 @@ "risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4978,10 +4993,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4991,10 +5006,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5021,29 +5036,29 @@ msgstr "Loro versione (insieme dei dati del server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" "Mantieni la coppia chiave/valore selezionata dall'insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" "Mantieni la coppia chiave/valore selezionata dall'insieme di dati del server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Irrisolto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Marca le etichette selezionate come irrisolte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -5070,22 +5085,22 @@ msgstr "Nessun conflitto da risolvere" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Annulla la risoluzione del conflitto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Applica i conflitti risolti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Applica" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5093,5 +5108,5 @@ msgstr "nessuno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5189,6 +5204,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5199,5 +5214,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5212,21 +5227,21 @@ "La posizione {0} è fuori dai limiti. Il numero di membri corrente è {1}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "Rimuovi questo membro dalla relazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 msgid "Keep" msgstr "Mantieni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 msgid "Keep this relation member for the target object" msgstr "Mantieni questo membro della relazione per l'oggetto in esame" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "Irrisolto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "Non ancora deciso" @@ -5234,5 +5249,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Ruolo:" @@ -5337,10 +5352,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5360,13 +5375,13 @@ msgstr "Pila dei comandi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "Risolvi i conflitti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Risolvi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5374,5 +5389,5 @@ "sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5381,25 +5396,25 @@ msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Annulla la risoluzione del conflitto e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Applica i conflitti risolti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Applica risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Chiudi comunque" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Continua risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5411,13 +5426,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Conflitto non risolto completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Risolvi conflitti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5429,8 +5444,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5497,5 +5512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5527,34 +5542,34 @@ msgstr "Apre la lista di tutti i livello caricati." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Cancella il livello selezionato." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Mostra/Nascondi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Inverte la visibilità del livello selezionato." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Attiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Attiva il livello selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Unisci questo livello con un altro livello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Sposta il livello selezionato in su." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Sposta il layer selezionato in giù." @@ -5564,18 +5579,17 @@ msgstr "Informazioni sul livello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Questo cambierà {0} oggetto." -msgstr[1] "Questo cambierà {0} oggetti." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Un valore vuoto cancella la chiave." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5584,10 +5598,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Cambiare i valori?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5596,5 +5610,5 @@ msgstr[1] "Cambia le proprietà di al massimo {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5603,9 +5617,9 @@ msgstr[1] "Questo cambierà {0} oggetti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Seleziona una chiave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Seleziona un valore" @@ -5629,103 +5643,99 @@ msgstr "Membro di" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Aggiungi proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Proprietà: {0} / Appartenenze: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Proprietà / Appartenenze" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Cambia relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Elimina dalla relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Cancella la chiave selezionata in tutti gli oggetti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Elimina proprietà" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Modifica proprietà" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Proprietà: {0} / Appartenenze: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Proprietà / Appartenenze" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Cambia relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Elimina dalla relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Cancella la chiave selezionata in tutti gli oggetti" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Elimina proprietà" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Apri tutte le relazioni in una lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relazioni: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Apri le relazioni selezionate in un editor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Cancella le relazioni selezionate" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Crea una nuova relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" "Crea una copia di questa relazione e aprila in un'altra finestra dell'editor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "Seleziona i membri di tutte le relazioni selezionate" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "Seleziona membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "Scarica tutti i membri delle relazioni selezionate" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "Scarica membri" @@ -5754,5 +5764,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5764,9 +5774,9 @@ msgstr "Selezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Stacca il pannello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5775,5 +5785,5 @@ "degli strumenti a sinistra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" @@ -5862,12 +5872,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Scarica i membri della relazione" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Conflitto nei dati" @@ -5887,5 +5897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5893,5 +5903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5901,18 +5911,18 @@ "Eccezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Etichette e Membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Relazioni da cui dipende" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Relazioni figlie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5925,14 +5935,14 @@ "circolari?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Rimuovili, ripulisci la relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Ignorali, mantieni la relazione com'è" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5945,9 +5955,9 @@ "aggiungere un altro membro alla relazione?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Più membri fanno riferimento alla stessa primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5960,5 +5970,5 @@ "''''{0}'''' omessa." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5967,5 +5977,5 @@ "del primo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5974,5 +5984,5 @@ "l'ultimo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5982,5 +5992,5 @@ "del primo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5990,5 +6000,5 @@ "l'ultimo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -5996,10 +6006,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Editor delle relazioni: Rimuovi selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" @@ -6008,5 +6018,5 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -6017,62 +6027,62 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "Seleziona le primitive per i membri della relazione selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Ordina i membri della relazione" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Editor delle relazioni: Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Sposta in alto i membri attualmente selezionati" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Editor delle relazioni: Sposta in alto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Sposta in basso i membri attualmente selezionati" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Editor delle relazioni: Sposta in basso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Rimuovi i membri correntemente selezionati da questa relazione" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Editor delle relazioni: Rimuovi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Elimina la relazione correntemente modificata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Si, crea un conflitto e chiudi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "" "Cliccare per creare un conflitto e chiudere questo editor delle relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "No, continua la modifica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" @@ -6081,5 +6091,5 @@ "modifica della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6091,9 +6101,9 @@ "desidera creare un conflitto e chiudere l'editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Conflitto nei dati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -6105,41 +6115,41 @@ "riprovare." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Applica gli aggiornamenti correnti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Applica gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Annulla gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Aggiungi una etichetta vuota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Editor delle relazioni: Scarica membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Imposta un ruolo ai membri selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Applica Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -6152,21 +6162,28 @@ "veramente applicare il nuovo ruolo?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Si, applica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "No, non applicare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Conferma ruolo vuoto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" "Modifica la relazione a cui fa riferimento il membro della relazione " "correntemente selezionato." + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Scaricamento della relazione {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -6176,9 +6193,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" msgstr "" -"Sposta la vista sulla primitiva a cui si riferisce il primo membro " -"selezionato" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -6191,11 +6205,7 @@ msgstr "Ingrandimento disabilitato perché non c'è alcun membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Fa riferimento a" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Collegato" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6208,5 +6218,5 @@ msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6282,9 +6292,9 @@ msgstr "Segnalibri" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "Non è stata selezionata nessuna area di scarico." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6295,13 +6305,13 @@ "maxlon): {0}, {1}, {2}, {3}" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "Crea segnalibro" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "Aggiungi un segnalibro per l'area di scarico correntemente selezionata" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." @@ -6310,39 +6320,39 @@ "un'area." +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." +msgstr "Inserire un nome per il segnalibro dell'area di scarico." + #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "Inserire un nome per il segnalibro dell'area di scarico." - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "Nome della posizione" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "Rimuovi i segnalibri correntemente selezionati" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "Rinomina i segnalibri correntemente selezionati" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "Lat min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "Lon min" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "Lat max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "Lon max" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6352,36 +6362,36 @@ "indirizzo URL qui per scaricare l'area)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Riquadro di selezione" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "La stringa ''''{0}'''' non è un valore in doppia precisione valido." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "Per la latitudine è richiesto un valore nell'intervallo [-90,90]." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "Per la longitudine è richiesto un valore nell'intervallo [-180,180]." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "Incolla indirizzo URL dagli appunti" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Sorgenti di dati e tipi" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Dati OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" @@ -6389,9 +6399,9 @@ "selezionata." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Dati GPS grezzi" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" @@ -6399,9 +6409,9 @@ "selezionata." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Scarica come nuovo layer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6412,18 +6422,18 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Area da scaricare" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Scarica" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "Nessuna area ancora selezionata" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -6431,21 +6441,21 @@ "dal server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Area da scaricare corretta, sarà probabilmente accettata dal server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "Cliccare per chiudere la finestra e per annullare lo scaricamento" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "Cliccare per scaricare l'area correntemente selezionata" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "Selezionare prima un'area di scarico." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6470,21 +6480,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Eccezione del puntatore nullo, è probabile che manchino alcuni tag." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "Cerca ..." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "Cliccare per iniziare la ricerca delle località" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "Interrogazione del server dei nomi" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "Interrogazione del server dei nomi ..." @@ -7223,8 +7233,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7397,5 +7407,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7407,5 +7417,5 @@ msgstr "Tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "Vicino a" @@ -7457,5 +7467,5 @@ msgstr "Browser dell'aiuto di JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7476,5 +7486,5 @@ "({1}) oppure nella lingua inglese.

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7489,5 +7499,5 @@ "messaggio di errore è (non tradotto):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7499,19 +7509,19 @@ "propria
connessione ad internet" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "Fallita l'apertura dell'indirizzo URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "Apri la pagina di aiuto corrente in un browser esterno" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "Modifica la pagina di aiuto corrente" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7524,28 +7534,28 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "Ricarica la pagina di aiuto corrente" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "Vai alla pagina precedente" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "Vai alla pagina successiva" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "Vai alla pagina iniziale di aiuto a JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "Attenzione: posizione errata nel documento HTML. L'eccezione è stata: " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 msgid "Failed to open help page. The target URL is empty." msgstr "" @@ -7553,5 +7563,5 @@ "vuoto." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 msgid "Failed to open help page" msgstr "Fallita l'apertura della pagina di aiuto" @@ -7575,5 +7585,5 @@ msgstr "Longitudine: " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "Coordinate" @@ -7645,12 +7655,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7675,33 +7685,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Nodo {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Porta lo zoom sul problema" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Carica storico" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Percorso {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7710,7 +7718,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Ordina il menu dei preimpostati" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7728,7 +7735,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7756,21 +7762,19 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 +#, java-format +msgid "" +"Version {0} created on {1}" +msgstr "" "Versione {0} creata il {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 -#, java-format -msgid "" -"Version {0} created on {1}" -msgstr "" -"Versione {0} creata il {1}" - #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7799,17 +7803,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versione {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "cancellato" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Versione {0} creata il {1} da {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7863,10 +7866,10 @@ msgstr "Chiusura del gruppo di modifiche {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "Lancia una finestra di selezione file" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Seleziona il nome del file" @@ -8106,5 +8109,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -8127,17 +8130,17 @@ msgstr "Layer" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Caricare?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Salvare?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Nome del file" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -8153,7 +8156,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Etichette del nuovo insieme di modifiche" @@ -8196,30 +8199,30 @@ msgstr[1] "{0} oggetti da eliminare:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Carica le modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Carica le primitive modificate" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" "Inserire un commento per questo insieme di modifiche (min. 3 caratteri)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "Commento non valido" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Annulla il caricamento e ritorna alle modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Carica tutte le modifiche in una sola richiesta" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -8230,40 +8233,40 @@ "modificata" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Crea un breve commento ai cambiamenti che sta caricando:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "Inserire un commento al caricamento (min. 3 caratteri)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Apri un nuovo insieme di modifiche" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" "Apri un nuovo insieme di modifiche ed utilizzalo al prossimo caricamento" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Utilizza un insieme di modifiche aperto" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Carica i dati su un insieme di modifiche già aperto" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Chiudi l'insieme di modifiche dopo il caricamento" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" "Selezionare per chiudere l'insieme di modifiche dopo il prossimo caricamento" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -8271,16 +8274,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Carica dal server la lista degli insiemi di modifiche personali aperti" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Chiudi l'insieme di modifiche aperto correntemente selezionato" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8330,24 +8333,24 @@ msgstr "Continua il caricamento" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Immagini per {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Leggi GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8355,33 +8358,33 @@ msgstr "Lettura di {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Non è stata trovata nessuna immagine con una data leggibile." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Immagini geoetichettate" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS inizio: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS fine: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "differenza attuale: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "differenza fuso orario: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8390,14 +8393,14 @@ msgstr[1] "immagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} in questa traccia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Sincronizza tempo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8405,32 +8408,32 @@ msgstr "Immagini JPEG (*.jpeg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Impossibile leggere la data nel file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Orario non presente nei dati EXIF del file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Immagine" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Fuso orario del GPS (differenza rispetto alle foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizza l'orario con l'unità GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Impossibile decodificare l'orario inserito." @@ -8520,5 +8523,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8570,10 +8573,10 @@ msgstr[1] "{0} punti del percorso" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Converti in livello dati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8584,11 +8587,11 @@ "tracciati, vedere qui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8598,29 +8601,29 @@ msgstr "Convertito da: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Scarica da OSM lungo questo tracciato" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Scarica tutto entro:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Area massima per richiesta:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km quadrati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8631,9 +8634,9 @@ "vuole procedere?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Nessuna traccia GPX da associare con l'audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8644,5 +8647,5 @@ "all'inizio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8652,19 +8655,19 @@ "tracciato per poter essere giustamente calcolati." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Livello dati {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "al di fuori dell'area scaricata" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versione {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -8672,5 +8675,5 @@ "nella versione 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8679,5 +8682,5 @@ msgstr[1] "Sono stati individuati {0} conflitti." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8697,5 +8700,5 @@ "server." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8712,11 +8715,11 @@ "conflitti e risolverli manualmente." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Cliccare per chiudere questa finestra e continuare a modificare" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8725,22 +8728,35 @@ msgstr[1] "{0} eliminati" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "disattiva" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Versione delle API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Converti in un layer GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Non è stato trovato un percorso \"from\"." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8838,9 +8854,9 @@ msgstr "Non ci sono marcatori audio in questo layer da compensare." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Mostra/Nascondi testo/icone" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Invertire la visualizzazione dei marcatori di testo ed icone" @@ -8908,5 +8924,5 @@ "Il valore di default è sconosciuto (l'impostazione non è stata ancora usata)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8914,5 +8930,5 @@ msgstr "Scegli la riga da modificare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8920,5 +8936,5 @@ msgstr "Nuovo valore per {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8927,5 +8943,5 @@ msgstr "Scegli la riga da cancellare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Inserisci una nuova coppia chiave/valore" @@ -9071,40 +9087,40 @@ msgstr "Calibrazione del registratore vocale" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Colore" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Stile di disegno {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Livello: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Scegliere" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Scegliere un colore per {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Reimposta predefinito" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Reimposta tutto predefinito" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Colori usati da diversi oggetti in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Colori" @@ -9564,17 +9580,17 @@ "È necessario riavviare JOSM perché alcune impostazioni abbiano effetto." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Visualizza le coordinate come" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Metodo di proiezione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "Codice proiezione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "Confini" @@ -9584,5 +9600,5 @@ msgstr "Proiezione della mappa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9641,83 +9657,83 @@ msgstr "Scorciatoia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "Stili attivi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "Stili disponibili (da {0})" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Percorso Icone" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Breve descrizione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "Indirizzo URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Autore: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Pagina internet: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Versione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "Aggiungi un nome di file o un indirizzo URL di uno stile attivo" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "Rimuovi gli stili selezionati dalla lista degli stili attivi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" "Modifica il nome di file o indirizzo URL per lo stile attivo selezionato" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" "Aggiungi gli stili disponibili selezionati alla lista degli stili attivi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "Ricarica la lista degli stili disponibili da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "Aggiungi il percorso di una nuova icona" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "Rimuovi i percorsi delle icone selezionati" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "Modifica il percorso dell'icona selezionata" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "Caricamento dei sorgenti dello stile da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9728,6 +9744,6 @@ "da
''''{0}''''.

Dettagli (non tradotti):
{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9923,10 +9939,10 @@ msgstr "Gruppi dei modificatori" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9936,13 +9952,13 @@ msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Aggiungi una nuova etichetta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Elimina la selezione nella tabella delle etichette" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9950,18 +9966,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Attributi opzionali:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "percorso chiuso" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Tipo sconosciuto: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9972,15 +9988,15 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Impossibile leggere {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Sono supportati elementi di tipo {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9990,18 +10006,18 @@ msgstr[1] "Modifica {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -10017,6 +10033,6 @@ msgstr "Gruppo preimpostato {0}" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -10025,8 +10041,21 @@ msgstr "Collegamento al server OSM in corso..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Scaricamento dei punti da {0} a {1} in corso..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "Fallita l''analisi della data ''{0}'' restituita dal server." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''." #. SAXException does not chain correctly @@ -10144,5 +10173,5 @@ msgstr "Modalità {0} sconosciuta." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10151,6 +10180,6 @@ "dedurre il tipo di primitiva." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -10160,20 +10189,20 @@ msgstr "Scaricamento dei dati OSM in corso..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Prelevamento del nodo con {0} da ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Prelevamento del percorso con id {0} da ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Prelevamento della relazione con id {0} da ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -10181,20 +10210,20 @@ "Il server ha risposto con il codice 404 per l''identificativo {0}. Saltato." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Prelevamento di un insieme di nodi da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Prelevamento di un insieme di percorsi da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Prelevamento di un insieme di relazioni da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10263,5 +10292,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -10276,63 +10305,63 @@ "''''{0}''''. Ottenuto ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Creazione dell'insieme di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Insieme di modifiche {0} aperto con successo" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Aggiornamento dell'insieme di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Aggiornamento dell''insieme di modifiche {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Chiusura del gruppo di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Invio in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Attesa di 10 secondi ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Inizio del ripristino {0} di {1} in {2} secondi ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - nuovo tentativo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "Inizio del ripristino {0} di {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" "L'insieme di modifiche corrente è nullo. Non si possono caricare i dati." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -10341,5 +10370,5 @@ "{0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10376,5 +10405,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10405,5 +10434,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10411,5 +10440,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10424,5 +10453,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10593,5 +10622,5 @@ msgstr "il file \"{0}\" non esiste" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10602,5 +10631,5 @@ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10608,10 +10637,10 @@ "." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Attributo obbligatorio ''''{0}'''' mancante su del percorso {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." @@ -10620,5 +10649,5 @@ "{0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10626,10 +10655,10 @@ "dell'elemento ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Attributo ''''ref'''' mancante sul membro nella relazione {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" @@ -10638,10 +10667,10 @@ "{0}. Ottenuto {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10651,9 +10680,9 @@ "relazione {1}. Ottenuto {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr " incompleto, specificazione con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." @@ -10662,10 +10691,10 @@ "ingresso. Omesso." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Oggetto illegale con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10677,10 +10706,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10692,20 +10719,20 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Versione delle API sconosciuta o non supportata. Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Attributo ''''versione'''' mancante sulla primitiva OSM con ID {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Manca l''attributo obbligatorio ''''{0}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." @@ -10713,5 +10740,5 @@ "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -11213,5 +11240,5 @@ msgstr "(Il testo è stato già copiato nei tuoi appunti)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -11223,15 +11250,5 @@ "propria connessione ad internet." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" -"Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul server " -"OSM ''''{1}''''.
L''insieme di modifiche sarà automaticamente chiuso dal " -"server dopo un intervallo massimo di attesa." - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -11244,5 +11261,5 @@ "{1}, rimuovere il riferimento alla relazione {0}, e riprovare." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -11254,10 +11271,5 @@ "usato
viola una precondizione.
Il messaggio di errore é:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "Fallita l''analisi della data ''{0}'' restituita dal server." - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -11268,5 +11280,5 @@ "strong>
perché è stato già chiuso." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -11277,5 +11289,5 @@ "strong>
perché è stato già chiuso il {1}." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -11286,9 +11298,18 @@ "errore (non tradotto):
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "Il server riporta che è stato trovato un conflitto." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, fuzzy, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" +"Fallita la chiusura dell''insieme di modifiche {0}
perché è stato già chiuso il {1}." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -11302,5 +11323,5 @@ "caricata da ''''{1}''''." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -11311,5 +11332,5 @@ "
Controllare la propria connessione ad internet." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -11321,5 +11342,5 @@ "
Dettagli (non tradotti): {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -11331,10 +11352,10 @@ "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.
" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -11347,10 +11368,10 @@ "OSM." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "
Messaggio di errore (non tradotto): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -11366,5 +11387,5 @@ "''''{0}'''' per identificare eventuali errori di battitura." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -11378,5 +11399,5 @@ "ad internet." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -12151,5 +12172,5 @@ msgstr "Errore nel file {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -12165,29 +12186,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "Seleziona Feuille" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Errore durante il caricamento del file" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "File cache della zona 1 di Lambert (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "File cache della zona 1 di Lambert (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "File cache della zona 2 di Lambert (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "File cache della zona 3 di Lambert (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "File cache della zona 4 di Lambert (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -12218,13 +12259,13 @@ msgstr "Scegliere da..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Sorgente auto-determinata" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12237,13 +12278,13 @@ "Si desidera ripristinare F11 per l'azione di cattura ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "Ripristino della scorciatoia F11 di cattura" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12557,43 +12598,50 @@ msgstr "Imposta {0} coordinate di Lambert" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "Imposta manualmente la zona di Lambert" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zona" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Zona di Lambert" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Carica la posizione dalla cache (solo se la cache è abilitata)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "{0} non ammesso con la proiezione corrente" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Zona di Lambert {0} nella cache non compatibile con la zona di Lambert {1} " +"corrente" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Cambia posizione" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Imposta una nuova posizione per la prossima richiesta" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Aggiungi un nuovo livello" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Posizione" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12603,5 +12651,5 @@ "punteggiatura conosciuta da www.cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Aggiungi un nuovo livello" @@ -12632,5 +12680,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Regola WMS" @@ -12662,5 +12710,5 @@ "Selezionare prima uno di questi, e poi riprovare" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12668,28 +12716,28 @@ msgstr "Livello vuoto" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "Layer WMS ({0}), {1} tasselli caricati" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Non è vettorializzato" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "Dimensioni raster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "E' stato vettorializzato" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Riquadro del comune: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12700,9 +12748,9 @@ "Crearne uno nuovo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Errore nel formato della cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12711,20 +12759,7 @@ "corrente" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Errore nella zona di Lambert della cache" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" -"Il livello corrente è all''interno della zona di Lambert CC9 \"{0}\"\n" -"dove il comune è all''interno della zona di Lambert CC9 \"{1}\".\n" -"Caricare le proprie modifiche, chiudere tutti i livelli e cambiare\n" -"manualmente la zona di Lambert dal menu Cadastre" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13797,20 +13832,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Si vuole permettere questo?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Conferma l'azione del controllo remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "il controllo remoto ha richiesto la creazione di un nuovo nodo." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13934,13 +13969,9 @@ msgstr "Diminuisci l'ingrandimento" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "Blocca alla dimensione del tassello" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Svuota la cache dei tasselli" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "immagine " @@ -14538,5 +14569,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +#, fuzzy +msgid "Unconnected coastline" msgstr "Linea di costa non connessa" @@ -15222,12 +15254,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Scarica" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Scarica i dati della mappa dal server OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -15243,8 +15273,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Non ci sono livelli al quale unire il livello sorgente ''{0}''." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -15266,12 +15295,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Rimozione dei nodi duplicati in corso..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 -#, fuzzy msgid "No more connected ways to download." -msgstr "Non è stata selezionata nessuna area di scarico." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221 @@ -15335,29 +15362,29 @@ msgstr "Nessun id o indirizzo URL WMS valido" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Regola la posizione del livello WMS selezionato" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Selezionare il livello WMS da regolare." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Seleziona il livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Inizia la regolazione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "Non c'è al momento alcun livello WMS da regolare." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "Nessun livello da regolare" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -15368,5 +15395,5 @@ "''&'' o ''?''." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -15376,10 +15403,10 @@ "Verificare le proprie impostazioni." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "Attenzione: l''indirizzo URL completo è ''{0}''." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -15394,5 +15421,5 @@ msgstr "Scaricamento automatico" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -15401,9 +15428,9 @@ "non corretto ''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(disattivato)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" @@ -15411,10 +15438,10 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -15430,13 +15457,13 @@ "WMS?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Si, preleva le immagini" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "Indirizzo URL non valido?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -15445,44 +15472,49 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Ricarica i tasselli non corretti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Salva livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Carica livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Errore nel formato del file" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Crea segnalibro" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27862,8 +27894,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "combinazione di etichette insolito" @@ -27883,34 +27914,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "Mappe NPE" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "Mappe NPE (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Satellite" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27920,9 +27940,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27936,107 +27959,159 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "non c'è alcuna primitiva con versione {0} in questo storico" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "Non c'è alcuna versione valida alla data ''{0}'' in questo storico" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto." - -#~ msgid "No type found. History is empty." -#~ msgstr "Nessun tipo trovato. Lo storico è vuoto." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "Mappe NPE" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "Mappe NPE (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "File cache della zona 2 di Lambert (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "File cache della zona 3 di Lambert (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "File cache della zona 4 di Lambert (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "File cache della zona 2 di Lambert (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "File cache della zona 3 di Lambert (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "File cache della zona 4 di Lambert (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "File cache della zona 1 di Lambert (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "File cache della zona 1 di Lambert (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "File cache della zona 1 di Lambert (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "File cache della zona 1 di Lambert (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "File cache della zona 1 di Lambert (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." #~ msgstr "" -#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0}" - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ "IMPORTANTE: dati posizionati lontano dai limiti\n" +#~ "della zona di Lambert attualmente usata.\n" +#~ "Non caricare nessun dato dopo questo messaggio.\n" +#~ "Annulla l'ultima operazione, salva il tuo lavoro\n" +#~ "e crea un nuovo layer sulla nuova zona." + +#~ msgid "Edit Properties" +#~ msgstr "Modifica proprietà" + +#~ msgid "Linked" +#~ msgstr "Collegato" + +#~ msgid "" +#~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +#~ "changeset will automatically be closed by the server after a timeout." #~ msgstr "" -#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} " -#~ "e versione {1}" - -#~ msgid "Select a starting node on the end of a way" -#~ msgstr "Selezionare un nodo iniziale alla fine di un percorso" - -#~ msgid "Reached the end of the line" -#~ msgstr "E' stata raggiunta la fine della linea" - -#~ msgid "Reached a junction" -#~ msgstr "E' stato raggiunto un incrocio" - -#~ msgid "help" -#~ msgstr "aiuto" - -#~ msgid "Help / About" -#~ msgstr "Aiuto / Informazioni su" +#~ "Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul " +#~ "server OSM ''''{1}''''.
L''insieme di modifiche sarà automaticamente " +#~ "chiuso dal server dopo un intervallo massimo di attesa." + +#~ msgid "Set manually the Lambert zone" +#~ msgstr "Imposta manualmente la zona di Lambert" + +#~ msgid "Zone" +#~ msgstr "Zona" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " -#~ "- these will then show up in the WMS menu.\n" -#~ "\n" -#~ "You can also do this manually in the Advanced Preferences, using the " -#~ "following schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " -#~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " -#~ "in this example, replacing 73 with your image id:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " -#~ "use." +#~ "Current layer is in Lambert CC9 Zone \"{0}\"\n" +#~ "where the commune is in Lambert CC9 Zone \"{1}\".\n" +#~ "Upload your changes, close all layers and change\n" +#~ "manually the Lambert zone from the Cadastre menu" #~ msgstr "" -#~ "Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda " -#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu " -#~ "WMS.\n" -#~ "\n" -#~ "Si possono anche aggiungere manualmente nelle Preferenze Avenzate, " -#~ "utilizzando il seguente schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Esempio di indirizzo URL completo di WMS (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è " -#~ "solo necessario inserire l'identificativo rilevante.\n" -#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare " -#~ "manualmente l'indirizzo URL come in questo esempio, sostituendo 73 con " -#~ "l'identificativo della propria immagine:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Nota: Assicurarsi che l'immagine sia conforme, con un diritto d'autore " -#~ "ragionevole, e, se non si è sicuri, non utilizzarla." - -#~ msgid "WMS Plugin Help" -#~ msgstr "Aiuto sull'estensione WMS" +#~ "Il livello corrente è all''interno della zona di Lambert CC9 \"{0}\"\n" +#~ "dove il comune è all''interno della zona di Lambert CC9 \"{1}\".\n" +#~ "Caricare le proprie modifiche, chiudere tutti i livelli e cambiare\n" +#~ "manualmente la zona di Lambert dal menu Cadastre" + +#~ msgid "Snap to tile size" +#~ msgstr "Blocca alla dimensione del tassello" #~ msgid "No data imported." @@ -28245,4 +28320,7 @@ #~ msgstr "Aggiusta la posizione dl layer WMS" +#~ msgid "help" +#~ msgstr "aiuto" + #~ msgid "" #~ "The selected nodes have differing relation memberships. Do you still " @@ -28273,4 +28351,7 @@ #~ msgstr "Modifica stazione" +#~ msgid "Help / About" +#~ msgstr "Aiuto / Informazioni su" + #~ msgid "Validate either current selection or complete dataset." #~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati." @@ -28328,4 +28409,7 @@ #~ msgid "Show Tile Status" #~ msgstr "Mostra lo stato dei tasselli" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Aiuto sull'estensione WMS" #~ msgid "" @@ -28786,4 +28870,13 @@ #~ "conflitto, ottenuto " +#~ msgid "Reached the end of the line" +#~ msgstr "E' stata raggiunta la fine della linea" + +#~ msgid "Select a starting node on the end of a way" +#~ msgstr "Selezionare un nodo iniziale alla fine di un percorso" + +#~ msgid "Reached a junction" +#~ msgstr "E' stato raggiunto un incrocio" + #~ msgid "" #~ "Properties in the merged element. They will replace properties in my " @@ -28861,4 +28954,53 @@ #~ msgid "Add a new XML source to the list." #~ msgstr "Aggiungi una nuova sorgente XML alla lista." + +#~ msgid "" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" +#~ "\n" +#~ "You can also do this manually in the Advanced Preferences, using the " +#~ "following schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Full WMS URL input format example (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " +#~ "only need to input the relevant 'id'.\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " +#~ "use." +#~ msgstr "" +#~ "Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda " +#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu " +#~ "WMS.\n" +#~ "\n" +#~ "Si possono anche aggiungere manualmente nelle Preferenze Avenzate, " +#~ "utilizzando il seguente schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Esempio di indirizzo URL completo di WMS (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è " +#~ "solo necessario inserire l'identificativo rilevante.\n" +#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare " +#~ "manualmente l'indirizzo URL come in questo esempio, sostituendo 73 con " +#~ "l'identificativo della propria immagine:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Nota: Assicurarsi che l'immagine sia conforme, con un diritto d'autore " +#~ "ragionevole, e, se non si è sicuri, non utilizzarla." #~ msgid "Sort" @@ -28974,4 +29116,13 @@ #~ msgstr "Valore di ritorno inatteso. Ottenuto {0}" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "non c'è alcuna primitiva con versione {0} in questo storico" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Non c'è alcuna versione valida alla data ''{0}'' in questo storico" + +#~ msgid "No latest version found. History is empty." +#~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "indice fuori dai limiti Ottenuto {0}" @@ -29019,4 +29170,22 @@ #~ "La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"." #~ "
Eliminare dalla relazione?" + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati." + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto." + +#~ msgid "No type found. History is empty." +#~ msgstr "Nessun tipo trovato. Lo storico è vuoto." + +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "" +#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} " +#~ "e versione {1}" + +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "" +#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0}" #~ msgid "Relation: from {0} to {1} via {2}" Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 18772) +++ applications/editors/josm/i18n/po/ja.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-15 18:25+0000\n" -"Last-Translator: nazotoko \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-23 06:45+0000\n" +"Last-Translator: higa4 \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:08+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "ヘルプ" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "不正な形式のURLの\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,22 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "不正な形式のファイルURL\"{0}\"を無視します。" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,18 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "エラー" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -309,5 +310,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -316,27 +317,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -354,5 +355,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "キャンセル" @@ -364,19 +365,19 @@ "さい。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "対象のレイヤーを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "対象のレイヤーを選択する。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "マージ" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -387,5 +388,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "対象のレイヤーがありません。" @@ -498,13 +499,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -602,20 +603,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "ファイル: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "開かれた変更セットはありません" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "開かれた変更セットはありません" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -652,10 +653,10 @@ "ウェイを結合できません（これらをノードの一列として統合することができません）" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0}ウェイを結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "結合するウェイを少なくとも二つ選択してください。" @@ -701,10 +702,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -723,11 +724,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "上書きする" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "ファイルが存在します。上書きしますか？" @@ -775,5 +776,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -782,6 +783,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -797,7 +798,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -825,5 +825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "複製" @@ -847,30 +847,30 @@ msgstr "アプリケーションを終了します。" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "全てのフォーマット" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "GPXにエクスポート..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "データをGPXファイルにエクスポートします。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "エクスポートするものがありません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -878,13 +878,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -903,8 +903,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -912,7 +912,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -935,9 +935,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -949,5 +949,5 @@ msgstr "パラメータ ''{0}'' はヌルであってはなりません。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -957,5 +957,5 @@ "''{0}''。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "GPX ファイルをエクスポート" @@ -1103,6 +1103,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "新規" @@ -1234,5 +1234,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "貼り付け" @@ -1319,11 +1319,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "保存" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "最新データを保存します。" @@ -1380,10 +1380,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "名前をつけて保存..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "現在のデータを新規ファイルに保存" @@ -1402,29 +1402,29 @@ "ジェクトも選択します。" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "状況報告を見る" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "バグに添付できる有用な情報と一緒にステータスレポートを表示する" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "ヘルプ: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "状況報告" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "クリップボードにコピーして閉じる" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1589,5 +1589,5 @@ msgstr "ノードを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1595,5 +1595,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1640,23 +1640,22 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "データのダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "現在のデータセットが見つかりません" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "現在のデータセットには ID {0} のオブジェクトがありません" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" msgstr "選択を更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1664,32 +1663,30 @@ "サーバから（再ダウンロードデータ）現在選択されたオブジェクトを更新します" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "選択を更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "更新用に選択されたプリミティブがありません。" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "更新するオブジェクトが選択されていません" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "選択は空です" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "オブジェクトを削除" - +msgstr "オブジェクトを更新" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "データをアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "OSMサーバへの有効なデータレイヤーの全ての変更をアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1700,5 +1697,5 @@ "さい。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1706,29 +1703,29 @@ msgstr "アップロードする変更はありません。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "アップロードするものがありません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "ノード {0} だけを同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "ウェイ {0} だけを同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "リレーション {0} だけを同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "データセット全体を同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1750,11 +1747,11 @@ "してください。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "競合が検出されました" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1770,5 +1767,5 @@ "さい。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1781,22 +1778,22 @@ "に開いている変更セットをアップロードしてください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "変更セットは閉じられました" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "競合解決の準備" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "クリックしてノード {0}用の全ての親ウェイをダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "クリックしてキャンセル後に地図編集を再開" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1811,19 +1808,19 @@ "グで解決できる競合として作成します。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "ノードはまだ使用中です" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "プリミティブ更新中" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1832,5 +1829,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1841,5 +1838,5 @@ "トをスキップしてもう一度アップロードします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." @@ -1848,10 +1845,10 @@ "キップします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "{0} オブジェクトをアップロード中 ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1963,17 +1960,17 @@ msgstr "ゆっくり再生" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "GPSデータをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "ダウンロードされたGPXデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "データをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1981,5 +1978,5 @@ msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "この範囲ではデータは見つかりません" @@ -2040,9 +2037,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "ダウンロード中にエラーです。" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "ダウンロード中にエラー" @@ -2060,5 +2057,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2066,5 +2063,5 @@ msgstr "モード: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2160,7 +2157,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2169,9 +2165,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2185,5 +2180,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2202,17 +2197,17 @@ msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "要素を移動" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "これらを移動する。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "移動を取り消す" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2225,13 +2220,13 @@ "本当に移動しますか？" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "常に移動し、ダイアログ表示は不要" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2240,9 +2235,9 @@ "マージします。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "回転を止めるには、マウスボタンを放します。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2252,15 +2247,15 @@ "え);Shft-Ctrlで選択を回転。;選択を変更。" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "ズーム" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "ズームと地図の移動" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2270,10 +2265,10 @@ "移動; 右ドラッグによるズーム" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "検索..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2282,60 +2277,59 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "フィルター文字列を入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "検索文字列を入力してください" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "正規表現検索" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "セレクションを置換" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "セレクションに加える" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "セレクションの削除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "選択範囲の中から見つける" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "大/小文字を区別する" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "正規表現検索" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"ベイカー ストリート - 任意のキーや名前の 'ベイカー' と 'ストリート'。" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"ベイカー ストリート - 任意のキーや名前の 'ベイカー' と 'ストリート'。" +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"ベイカー ストリート\" - 任意のキーや名前の 'ベイカー ストリート'。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"ベイカー ストリート\" - 任意のキーや名前の 'ベイカー ストリート'。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' その名前のどこか。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - 正確に 'route'の値を持つキー 'type'です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2345,35 +2339,35 @@ "type=, *=*, *=もできます。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - その名前の内 'Bak' でない。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - key=任意の値を入力してください." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "特殊なターゲット:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - オブジェクトの型 (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - オブジェクトの型 (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - 該当ユーザに変更された全オブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - オブジェクトに与えられた ID (0 は新しいオブジェクト)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - 指定されたノード番号のオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2381,43 +2375,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "変更済み - 変更されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "選択- 選択されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "不完全 - すべての不完全なオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "タグなし - すべてのタグなしオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "| や ORを、論理和をとるために使う" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "\" を演算子をくくるために使ってください。（例：キーが：を含む)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "グループの分類のために ( と ) を使用する。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2427,51 +2421,51 @@ msgstr "フィルター" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "フィルターを登録" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "検索開始" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "\"{0}\"にマッチするものが見つからない" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "''{0}'' を探しましたがセレクションの中には見つかりませんでした" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "{0} の一致が見つかりました" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2489,5 +2483,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2495,10 +2489,10 @@ "ださい: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2507,26 +2501,26 @@ "\"relation\"です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "予想外のトークン: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "orに引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "not に引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "閉じ括弧があるはずです。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2535,9 +2529,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "間違った数のパラメータが、ノード演算子に渡されました。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2548,5 +2542,5 @@ "い、例えば ノード: 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2653,7 +2647,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2764,5 +2758,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "二重の競合" @@ -2791,5 +2785,5 @@ "です。" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2797,6 +2791,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "未決の競合を解決できません" @@ -2811,8 +2805,12 @@ msgid "At least one object to delete required, got empty collection" msgstr "" +"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り" +"ました" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106 msgid "At least one object to delete requird, got empty collection" msgstr "" +"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り" +"ました" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 @@ -2862,18 +2860,8 @@ msgstr "削除確認" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "{0} 内の削除済み状態の競合を解決" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2907,10 +2895,10 @@ msgstr "リレーション {0} からリファレンスを削除する" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "リレーション {0} のメンバーリスト内の競合を解決" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2943,20 +2931,20 @@ msgstr "シーケンス" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "ノード {1} の {0} タグ競合を解決" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "ウェイ {1} の {0} タグ競合を解決" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "リレーション {1} の {0} タグ競合を解決" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2978,10 +2966,10 @@ msgstr "リレーション {0} のバージョン競合を解決" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "ウェイ {0} のノードリスト中の競合を解決" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3025,5 +3013,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "新しい値" @@ -3070,7 +3058,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3079,10 +3067,10 @@ msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "不正な設定がファイルの{0}行目にあります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3093,5 +3081,5 @@ "ありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3102,5 +3090,5 @@ "ではありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3110,5 +3098,5 @@ "警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3119,5 +3107,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3127,5 +3115,5 @@ "す。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3135,5 +3123,5 @@ "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3144,5 +3132,5 @@ "トできません" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3153,5 +3141,5 @@ "
に取って、新しい初期設定ファイルを作ります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3162,10 +3150,10 @@ "に失敗" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3222,9 +3210,9 @@ msgid "" "Warning: unexpected JOSM version number in revison file, value is ''{0}''" -msgstr "" +msgstr "警告: リビジョンファイルに予期せぬJOSMバージョン番号、値は ''{0}''" #: ../core/src/org/openstreetmap/josm/data/Version.java:140 msgid "Warning: the revision file ''/REVISION'' is missing." -msgstr "" +msgstr "警告: リビジョンファイル ''/REVISION'' がありません。" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 @@ -3248,25 +3236,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "南" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "北" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "西" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3274,11 +3262,11 @@ msgstr "変更セット {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" "Unable to add primitive {0} to the dataset because it's already included" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3288,26 +3276,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "not に引数がありません。" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "リレーション {0} の履歴" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3316,6 +3304,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3323,7 +3311,4 @@ "Keeping target object. " msgstr "" -"ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョン " -"{2} の相手のプリミティブは表示されません。この不整合を解決できません。自分の" -"プリミティブを残します。 " #. translators notes must be in front @@ -3380,24 +3365,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "id=0 のプリミティブは非表示にできません" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "バージョン > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3405,5 +3390,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3436,10 +3421,10 @@ "す。" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +msgstr "同じuidで異なる名前のユーザが見つかりました" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3450,7 +3435,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。" +msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3470,7 +3455,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません" +msgstr "ID ''{0}'' のプリミティブとID ''{1}'' のプリミティブを比較できません。" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3605,10 +3590,10 @@ msgstr "エリアテキスト" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3620,6 +3605,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3628,5 +3613,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3635,6 +3620,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3651,6 +3636,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "背景" @@ -3668,24 +3653,36 @@ msgstr "ガウス-ラボルド会議1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"重要：データは、現在のランベルト図法のゾーン制限\n" -"の外にあります。\n" -"このメッセージ以降、データのアップロードを中止します。\n" -"最後に行った操作を取り消して、作業内容を保存し、\n" -"新しいレイヤーを新しいゾーンで開始してください。" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "ランベルトゾーン" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3699,27 +3696,56 @@ msgstr "メルカトル" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "スイスグリッド (スイス)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N (仏領)グアドループ海外県 Sainte-Anne 市 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N (仏領)マルティニーク海外県 Fort Desaix 市 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3734,10 +3760,10 @@ msgstr "ブックマークを書き込めません。
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "今後は表示しない" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3745,32 +3771,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "不完全" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "道路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "鉄道" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "水路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "土地利用" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3778,5 +3804,5 @@ msgstr[0] "{0}ノード" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3813,6 +3839,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "競合" @@ -3822,11 +3848,11 @@ msgstr "不明なホスト" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "オブジェクトは削除されました" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3843,5 +3869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82 msgid "Click to close the dialog" -msgstr "" +msgstr "クリックしてダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 @@ -4033,11 +4059,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4152,5 +4178,5 @@ msgstr "描きたい新規ウェイセグメントの長さ" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4160,18 +4186,18 @@ "ウスでこの表から直接選べます。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(オブジェクトなし)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "ユーザ:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "レイヤーがリストにありません。" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4180,5 +4206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50 msgid "Click to cancel the current operation" -msgstr "" +msgstr "クリックして現在の操作をキャンセル" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -4297,50 +4323,50 @@ msgstr "ロール {0} は比較ペア {1} に参加していません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "プロパティ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "タグ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "ノード" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "解決が必要な保留中のタグ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "タグ({0} 競合)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "解決待ちの保留中タグ競合 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "ノード(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4349,17 +4375,17 @@ "合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "ノード(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "このウェイのノードリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "メンバー(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4369,68 +4395,68 @@ "保留中の競合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "メンバー(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "このリレーションのメンバーリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "保留中のプロパティ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "プロパティ(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "解決が必要な保留中競合プロパティ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "競合の解決" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "現在のパラメータは範囲外です: {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "ロール {0} のリストは現在比較ペアに参加していません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "アイテム {0} はリストに見つかりません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "スクロールをロック" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "比較 " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "自分のバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "自分のデータセットの要素リスト、例：ローカルデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4438,5 +4464,5 @@ msgstr "結合したバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4446,30 +4472,30 @@ "るでしょう。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "相手のバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "相手のデータセットの要素リスト、例：サーバデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> 先頭" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "選択したノードを結合されたノードリストの先頭にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> 最後" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "選択した要素を結合された要素リストの最後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4478,5 +4504,5 @@ "選択した要素を、結合された要素リストから選択している最初の要素の前にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4485,14 +4511,14 @@ "選択した要素を、結合された要素リストから選択している最初の要素の後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "相手の選択した要素を、結合された要素リストの先頭にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "相手の選択した要素を、結合された要素リストの最後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4501,5 +4527,5 @@ "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4508,54 +4534,54 @@ "相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "上" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "同じ位置で選択した要素を上に移動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "下" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "同じ位置で選択したエントリを下に移動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "結合された要素のリストから選択したエントリを削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "固定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "結合された要素の現在のリストを固定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "固定解除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "結合された要素のリスト固定を解除して結合をはじめる" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4566,5 +4592,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4575,5 +4601,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4581,5 +4607,5 @@ msgstr[0] "自分のバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4587,5 +4613,5 @@ msgstr[0] "結合したバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4593,6 +4619,6 @@ msgstr[0] "相手のバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4602,6 +4628,6 @@ "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4612,5 +4638,5 @@ msgstr "ノード" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "結合したノードがまだ固定されていません。解決コマンドをビルドできません" @@ -4622,5 +4648,5 @@ msgstr "予期せぬカラムインデックス。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4629,19 +4655,19 @@ msgstr "サーバとの通信中にエラー発生
詳細: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "サーバとの通信失敗" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "はい、これも削除を取り消します" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "いいえ、操作をキャンセルします" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4652,9 +4678,9 @@ "す。

これらのノードも復活させたいですか?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "追加のノードの削除を取り消しますか？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4666,5 +4692,5 @@ "ミティブがあります。

これらも復活させたいですか?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "依存するプリミティブの削除を取り消しますか？" @@ -4690,84 +4716,84 @@ msgstr "座標:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "削除済み状態:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "表示状態:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(なし)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "削除しました" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "削除されていません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "表示(サーバ上)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "非表示(サーバ上)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "ローカルバージョンのクローンを残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "ローカルデータセットから物理的に削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "自分の座標を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "相手の座標を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "異なる座標間の競合を未決にする" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "自分の削除済み状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "相手の削除済み状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "削除済み状態間の競合を未決にする" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "自分の表示状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "はい、id をリセットします" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "いいえ、異常終了します" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4780,17 +4806,17 @@ "いidを割り当てます。
よろしいですか？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "id を0 にリセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "相手の表示状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "はい、破棄します" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4801,9 +4827,9 @@ "しなければなりません。
よろしいですか？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "データセットから削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "表示状態間の競合を未決にする" @@ -4818,19 +4844,19 @@ msgstr "結合したノードはまだ固定されていません。解決コマンドをビルドできません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<未定義>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4846,10 +4872,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4859,10 +4885,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4890,27 +4916,27 @@ msgstr "相手のバージョン (サーバデータセット)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "ローカルデータセットから選択されたキー/値のペアを残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "サーバデータセットから選択されたキー/値のペアを残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "未決" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "選択されたタグを未決にマーク" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4935,22 +4961,22 @@ msgstr "解決が必要な競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "競合解決をキャンセル" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "解決済み競合を適用" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "適用" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4958,5 +4984,5 @@ msgstr "なし" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5048,6 +5074,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5057,5 +5083,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5068,21 +5094,21 @@ msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "このリレーションメンバーをこのリレーションから除きます。" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "保持" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +msgstr "ターゲットのオブジェクト用にこのリレーションメンバーを保持" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "未決定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "未決定です" @@ -5090,5 +5116,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "ロール:" @@ -5116,4 +5142,5 @@ msgid "Enter a tag key, i.e. fixme" msgstr "" +"タグキーを入力してください、例）fixme" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 @@ -5125,4 +5152,6 @@ "Enter a tag value, i.e. check members" msgstr "" +"タグの値を入力してください、例）check members" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5175,10 +5204,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5198,17 +5227,17 @@ msgstr "指示の集積: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "競合を解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "上記リストの全てのアイテムを結合するダイアログを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5217,25 +5246,25 @@ msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "競合の解決をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "解決済みの競合を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "解決を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "強制的に閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "解決を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5247,13 +5276,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "競合は完全には解決されていません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "競合を解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5265,8 +5294,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5333,5 +5362,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5365,34 +5394,34 @@ msgstr "全ての読み込んだレイヤーのリストを開きます" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "選択したレイヤーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "表示/非表示" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "選択したレイヤーの表示状態を切り替え" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "選択されたレイヤーを有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "このレイヤーを他のレイヤーに結合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "選択したレイヤーを一つ上に上げます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "選択したレイヤーを一つ下に移動します。" @@ -5402,17 +5431,17 @@ msgstr "レイヤーについての情報" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "空の値でキーを削除。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5421,10 +5450,10 @@ msgstr "<差異あり>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "値を変更しますか?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5432,5 +5461,5 @@ msgstr[0] "{0}このオブジェクトのプロパティーの変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5438,9 +5467,9 @@ msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "キーを選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "値を選択してください" @@ -5464,104 +5493,100 @@ msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "プロパティの追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "プロパティ: {0} / メンバー: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "プロパティ/メンバー" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "関連の変更" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "関連から削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "本当に関連{0}から選択分を削除しますか？" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "すべてのオブジェクトの選択したキーの削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "プロパティの削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "すべてのオブジェクトに新しいキー/値をペアで追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "プロパティの編集" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "すべてのオブジェクトの選択したキーの値の編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "プロパティ: {0} / メンバー: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "プロパティ/メンバー" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "関連の変更" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "関連から削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "本当に関連{0}から選択分を削除しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "すべてのオブジェクトの選択したキーの削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "プロパティの削除" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "全てのリレーションのリストを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "リレーション: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "選択したリレーションの編集画面を開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "選択したリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "新規リレーション作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "現在の選択を選択したリレーションのリストへセットする" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +msgstr "全ての選択済リレーションのメンバーを選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +msgstr "メンバーを選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +msgstr "選択済リレーションの全メンバーをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" -msgstr "" +msgstr "メンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5588,5 +5613,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5598,9 +5623,9 @@ msgstr "選択: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "パネルの取り外し" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5609,5 +5634,5 @@ "ます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "クリックすることでパネルの内容を最小化/最大化" @@ -5690,12 +5715,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "リレーションメンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "データ内の競合" @@ -5714,5 +5739,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5720,5 +5745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5726,18 +5751,18 @@ msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "タグとメンバ－" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "親リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "子リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5749,14 +5774,14 @@ "参照をどうしますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "削除し、リレーションをクリーンナップ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "無視し、リレーションはそのまま" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5769,9 +5794,9 @@ "か？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "複数のメンバーが同じプリミティブを参照しています" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5783,5 +5808,5 @@ "起こすので薦められません。
リレーション ''{0}'' をスキップします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5789,5 +5814,5 @@ "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5795,5 +5820,5 @@ "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5803,5 +5828,5 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5811,20 +5836,20 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "リレーション編集画面: 削除が選択されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5834,66 +5859,66 @@ "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "選択されたリレーションメンバーのプリミティブを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "リレーションメンバーをソート" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "リレーション編集画面: ソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "現在選択したメンバーを一つ上に移動します" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "リレーション編集画面: 上へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "リレーション編集画面: 下へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "このリレーションから現在選択されたメンバーを削除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "リレーション編集画面: 削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "現在編集されたリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "はい、競合を作成して閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "クリックして競合を作成し、このリレーションエディタを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "いいえ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5904,9 +5929,9 @@ "集を続けることはできません

競合を作成してエディタを閉じますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "データ中に競合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5917,41 +5942,41 @@ "最初にこの競合を解決してからやり直してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "現在の更新を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "更新を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "更新をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "空のタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "リレーション編集画面: メンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "選択されたメンバーにロールをセット" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5963,19 +5988,26 @@ "ルを削除することになります。
新しいロールを本当に適用しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "はい、適用します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "いいえ、適用しません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "空のロールを確認" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "リレーション {0} をダウンロード中" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5985,7 +6017,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "最初に選択されたメンバーが参照しているプリミティブにズーム" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -5997,11 +6028,7 @@ msgstr "選択されたメンバーが無いのでズームは無効化されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "参照先" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "リンク済み" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6014,5 +6041,5 @@ msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6082,9 +6109,9 @@ msgstr "ブックマーク" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +msgstr "現在、ダウンロードするエリアが選択されていません。" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6093,52 +6120,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +msgstr "ブックマークを作成" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +msgstr "現在選択中のダウンロードエリアをブックマークに追加" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." msgstr "" +"現在はダウンロードエリアが選択されていません。最初にエリアを選択してくださ" +"い。" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." +msgstr "ブックマークされたエリアの名前を入力してください。" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "ロケーション名" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +msgstr "現在選択中のブックマークを削除" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +msgstr "現在選択中のブックマークをリネーム" + +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "最小緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "最小経度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "最大緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "最大経度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6148,52 +6177,52 @@ "ることができます。）" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "境界囲み" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "緯度の値は、[-90,90]の範囲にある必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "データソースと型" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMapデータ" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "生のGPSデータ" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "新しいレイヤーとしてダウンロードする" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6201,38 +6230,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "エリアをダウンロードする" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "ダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "ダウンロードするエリアが広すぎます; サーバから拒否されるでしょう" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "ダウンロード領域はOKです。指定のサイズはサーバに受け入れられるでしょう" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6254,21 +6283,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -7007,8 +7036,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7181,5 +7210,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7191,5 +7220,5 @@ msgstr "タイプ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7241,5 +7270,5 @@ msgstr "JOSM ヘルプブラウザ" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7253,5 +7282,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7262,5 +7291,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7269,19 +7298,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "URLを開けません" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "現在のヘルプページを外部ブラウザで開く" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "現在のヘルプページを編集" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7291,32 +7320,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "現在のヘルプページを再ロード" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "前のページへ" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "次のページへ" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "JOSM ヘルプホームページへ" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7338,5 +7367,5 @@ msgstr "経度 : " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "座標" @@ -7400,12 +7429,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7430,33 +7459,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "ノード {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "問題へズーム" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "履歴をロード" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "ウェイ {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7465,7 +7492,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "プリセットメニューの並び替え" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7483,7 +7509,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7511,21 +7536,19 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 +#, java-format +msgid "" +"Version {0} created on {1}" +msgstr "" "バージョン {0} 作成日 {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 -#, java-format -msgid "" -"Version {0} created on {1}" -msgstr "" -"バージョン {0} 作成日 {1}" - #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "<匿名>" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7553,17 +7576,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "バージョン{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "削除しました" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "バージョン {0} 作成日: {1} 作成者: {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7616,10 +7638,10 @@ msgstr "変更セット {0} を閉じています" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "ファイルを選ぶためにファイル選択を起動してください" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "ファイル名を選択" @@ -7840,5 +7862,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7861,17 +7883,17 @@ msgstr "レイヤー" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "アップロードしますか？" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "保存しますか？" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "ファイル名" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7887,7 +7909,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "新しい変更セットのタグ" @@ -7928,29 +7950,29 @@ msgstr[0] "{0} 個のオブジェクトを削除:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "変更のアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "変更されたプリミティブをアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "不正なアップロードコメント" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "アップロードをキャンセルして編集に戻る" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "ひとつのリクエストで全ての変更をアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7960,38 +7982,38 @@ "ティブごとにリクエストするには、無効にする。" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "アップロードする変更の概略コメントを入力してください。" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "アップロード用コメントを入力(最小3文字)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "新しい変更セットを開く" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "新しい変更セットを開き、次回アップロードで使用" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "開かれた変更セットを使用" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "既に開かれた変更セットにデータをアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "アップロード後に変更セットを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "次回アップロード後に閉じる「変更セット」を選択" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7999,16 +8021,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "自分の開いた変更セットのリストをサーバからロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "現在選択済みの開かれた変更セットを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8058,24 +8080,24 @@ msgstr "アップロードを続ける" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "{0} のイメージ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "GPXの読み込み…" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "地点 {0} x {1}に時刻がありません" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8083,33 +8105,33 @@ msgstr "{0}を読み込んでいます ..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "ジオタグのついた画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS開始: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS終了: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "現在の差分: {0} 秒" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "タイムゾーンの違い: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8117,14 +8139,14 @@ msgstr[0] "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "トラック内に {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "時計の同期" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8132,32 +8154,32 @@ msgstr "JPEGイメージ(*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "ファイル \"{0}\"中の日付が取得できません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "時刻をGPSユニットと同期する" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "入力した時刻は、解釈できません" @@ -8247,5 +8269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8294,10 +8316,10 @@ msgstr[0] "{0} ウェイポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "データレイヤーへ変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8308,11 +8330,11 @@ "てください：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8322,29 +8344,29 @@ msgstr "{0}からのコンバート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "このトラックに沿ってOSMからダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "次の範囲内の全てをダウンロード:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} メータ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "リクエストあたりの最大面積：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} 平方キロメートル" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8355,9 +8377,9 @@ "すか？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8367,5 +8389,5 @@ "に変更又は移動されました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8375,23 +8397,23 @@ "外します。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "データレイヤー {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "バージョン {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8399,5 +8421,5 @@ msgstr[0] "検出された競合が {0} 個あります" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8411,5 +8433,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8422,11 +8444,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8435,22 +8457,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0}は次からなります:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "設定解除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "APIバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "\"from\"ウェイが見つかりません" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8543,9 +8578,9 @@ msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "テキスト/アイコンの表示/非表示" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "マーカーテキストとアイコンの表示状態を切り替え" @@ -8611,5 +8646,5 @@ msgstr "不明なときの既定値(設定はまだ使われません）" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8617,5 +8652,5 @@ msgstr "編集する列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8623,5 +8658,5 @@ msgstr "新しい値は{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8630,5 +8665,5 @@ msgstr "削除する列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "新しいキー/値の組を入力" @@ -8763,40 +8798,40 @@ msgstr "ボイスレコーダの調整" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "塗りつぶしスタイル{0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "レイヤー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "{0}の色を選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "既定値に設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "全てを既定値に設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "JOSMの異なるオブジェクトが使う配色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "色" @@ -9234,17 +9269,17 @@ msgstr "設定を有効にするにはJOSMを再起動する必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "座標を次の単位で表示" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "投影法" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "射影コード" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "境界" @@ -9254,5 +9289,5 @@ msgstr "地図投影法" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9310,81 +9345,81 @@ msgstr "ショートカット" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "アイコンのパス" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "簡単な説明: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "作者: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "ウェブページ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "バージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9393,6 +9428,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9581,10 +9616,10 @@ msgstr "修飾グループ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9593,32 +9628,32 @@ msgstr[0] "{0} オブジェクトまで古いキーを削除" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "新しいタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "タグテーブルの選択を削除" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" -msgstr "この機能の詳細情報" +msgstr "この地物の詳細情報" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "オプションの属性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "閉じたウェイ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "不明なタイプ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9629,15 +9664,15 @@ msgstr "タグ付けプレセットのソース {0} を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "走査時にエラー: {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9646,18 +9681,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "選択が適切ではありません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "プリセットの適用" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "プロパティを変更する" @@ -9673,6 +9708,6 @@ msgstr "プレセットグループ {0}" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9681,8 +9716,21 @@ msgstr "OSMサーバに接続中..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "{1}にポイント{0}をダウンロード中..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "サーバから返されたデータ ''{0}'' が解析できません" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "予想外の形式のID がサーバから返されました。入力値: ''{0}''" #. SAXException does not chain correctly @@ -9799,5 +9847,5 @@ msgstr "不明なモード {0}。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -9806,6 +9854,6 @@ "不明" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9815,40 +9863,40 @@ msgstr "OSMデータをダウンロード中..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "id {0} のノードを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "id {0} のウェイを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "id {0} のリレーションを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID {0} に対してサーバが404コードを返しました。スキップします。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "''{0}'' からノードのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "''{0}'' からウェイのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "''{0}'' からリレーションのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9915,5 +9963,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9928,66 +9976,66 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "変更セットを作成しています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "変更セット {0} を開きました" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "変更セットを更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "変更セット {0} を更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "変更した設定を閉じています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "アップロード中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "10秒待機中 ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "{2} 秒で {1} 分の {0} 回の再試行を開始 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - やり直しています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "{1} 分の {0} 回の再試行を開始。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "現在の変更セットはヌルです。データをアップロードできません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10024,5 +10072,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10049,5 +10097,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10055,5 +10103,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10067,5 +10115,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10222,5 +10270,5 @@ msgstr "ファイル \"{0}\" はありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10231,39 +10279,39 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr " 要素を直接引き継いでない XML 要素の が見つかった。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "ウェイ {1} の上に必要な属性 ''{0}'' がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "要素 の属性 ''ref'' に不正な値。入力値: {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" "要素 の直接の子要素でないXML 要素 が見つかりました。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10272,19 +10320,19 @@ "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "ref=0の不完全な指定です。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "id=0の禁じられたオブジェクトです" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10294,10 +10342,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10309,25 +10355,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "ID {0} のOSM プリミティブ「の属性 ''version'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "必要な属性 ''{0}'' がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10808,5 +10854,5 @@ msgstr "(テキストはクリップボードにコピーされています。)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10817,14 +10863,5 @@ "ンターネット接続をチェックしてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" -"OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。
" -"変更セットはタイムアウト後にサーバによって自動的に閉じられます。" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10837,5 +10874,5 @@ "ン {0} への参照を削除し、再度アップロードしてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10847,10 +10884,5 @@ "タセットは前提条件に違反しています。
エラーメッセージ:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "サーバから返されたデータ ''{0}'' が解析できません" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10861,5 +10893,5 @@ "れています。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10870,5 +10902,5 @@ "閉じられています。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10877,9 +10909,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "サーバから競合検出の連絡がありました。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, fuzzy, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" +"変更セット{0}を閉じることができません。
{1} で既に" +"閉じられています。" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10892,5 +10933,5 @@ "ドしていないためだと思われます。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10901,5 +10942,5 @@ "チェックしてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10911,5 +10952,5 @@ "失敗しました。
詳細(原文): {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10920,10 +10961,10 @@ "おそらく一時的な問題です。後ほどやり直してみてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "OSM サーバ ''{0}'' より不正リクエストの報告がありました。
" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10935,10 +10976,10 @@ "ポートファイルを使用してください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "
エラーメッセージ(未訳): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10949,5 +10990,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10960,5 +11001,5 @@ "てください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11713,5 +11754,5 @@ msgstr "ファイル{0}にエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11726,29 +11767,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "用紙選択" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "ファイルの読み込みエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambert Zone 1 cache file (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert Zone 1 cache file (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambert Zone 2 cache file (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambert Zone 3 cache file (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert Zone 4 cache file (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11779,13 +11840,13 @@ msgstr "選択..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "自動ソーシング" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11797,13 +11858,13 @@ "F11 を取得アクションに戻しますか？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "F11 を取得ショートカットに戻す" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "変更が実施されるようにJOSM を停止しました" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12105,43 +12166,49 @@ msgstr "{0} ランベルト座標にセット" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "ランベルトゾーン" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "キャッシュから位置を読み込む(もしキャッシュが可能な場合)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "ロケーションの変更" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "次のリクエスト用に、新規の位置をセットしてください。" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "新規レイヤーを追加" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "ロケーション" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12151,5 +12218,5 @@ "cadastre.gouv.fr に従ってください。(フランス語の場合)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "新規レイヤーを作成" @@ -12179,5 +12246,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "WMSの調整" @@ -12207,5 +12274,5 @@ "最初にそのひとつを選んで、やり直してください" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12213,28 +12280,28 @@ msgstr "ブランクのレイヤー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMSレイヤー ({0}), {1}このタイル読み込み" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "ベクターではありません。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "ラスターサイズ: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "ベクタライズされました。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "都道府県 bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12245,9 +12312,9 @@ "であるべきです" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "キャッシュフォーマットエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12255,16 +12322,7 @@ "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "ランベルトゾーンキャッシュエラー" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13318,20 +13376,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "本当にこれを許可してよろしいですか？" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "リモート制御の指示を確認した" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "リモート制御より新しいノードを作成するかどうか問合せがきました。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13455,13 +13513,9 @@ msgstr "ズームダウン" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "タイルのキャッシュをフラッシュ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "画像 " @@ -14040,6 +14094,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "順序付いていない海岸線" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14692,12 +14747,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "ダウンロード" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "地図データをOSMサーバからダウンロード" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14713,9 +14766,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"統合元のレイヤー
''{0}''
を、統合する先のレイヤーがありません。" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14737,7 +14788,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "重複したノードの削除中…" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14805,29 +14855,29 @@ msgstr "正しいWMSまたはID がありません" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "選択されたWMSレイヤーの位置を調整してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "調整するWMSレイヤーを選択してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "WMSレイヤーを選択" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "調整開始" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "現在は調整するWMSレイヤーがありません。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "調整するレイヤーがありません" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14838,5 +14888,5 @@ "ん。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14844,10 +14894,10 @@ msgstr "警告: WMSタイルの取得に失敗したようです。設定をチェックしてください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "警告: 完全なURL は ''{0}' です。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14862,24 +14912,24 @@ msgstr "自動ダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(無効化)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14893,13 +14943,13 @@ "設定を
チェックしてください。
強制的にWMS タイルを取得しますか？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "はい、画像を取得します" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "不正なURL？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14907,44 +14957,49 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "見えるタイルのダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "解像度の変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "誤ったタイルのリロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "アルファチャンネル" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "WMSレイヤーをファイルに保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "WMS レイヤーを保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "WMS レイヤーをロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "ファイルフォーマットエラー" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "ブックマークを作成" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27304,8 +27359,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "通常無いタグの組み合わせ" @@ -27325,34 +27379,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPEマップ" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPEマップ(Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo 衛星" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27362,9 +27405,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Streets NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27378,34 +27424,858 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "チェコ CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "チェコ UHUL:ORTOFOTO" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPEマップ" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPEマップ(Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#~ msgid "null detected in node list" +#~ msgstr "ノードリストにヌルが見つかりました" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "重要：データは、現在のランベルト図法のゾーン制限\n" +#~ "の外にあります。\n" +#~ "このメッセージ以降、データのアップロードを中止します。\n" +#~ "最後に行った操作を取り消して、作業内容を保存し、\n" +#~ "新しいレイヤーを新しいゾーンで開始してください。" + +#~ msgid "Edit Properties" +#~ msgstr "プロパティの編集" + +#~ msgid "Linked" +#~ msgstr "リンク済み" + +#~ msgid "" +#~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +#~ "changeset will automatically be closed by the server after a timeout." +#~ msgstr "" +#~ "OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。" +#~ "
変更セットはタイムアウト後にサーバによって自動的に閉じられます。" + +#~ msgid "Move" +#~ msgstr "移動" + +#~ msgid "File could not be found." +#~ msgstr "ファイルは存在しませんでした。" + +#~ msgid "No data imported." +#~ msgstr "データーはインポートされませんでした。" + +#~ msgid "Data Layer" +#~ msgstr "データレイヤー" + +#~ msgid "Select a bookmark first." +#~ msgstr "最初にブックマークを選択してください、" + +#~ msgid "Please enter the desired coordinates first." +#~ msgstr "最初に目的の座標を入力してください。" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。" + +#~ msgid "Date" +#~ msgstr "日付" + +#~ msgid "Cannot connect to server." +#~ msgstr "サーバに接続できません。" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "リストを更新するために再読込のクリック" + +#~ msgid "Refresh the selection list." +#~ msgstr "選択したリストを更新する。" + +#~ msgid "Commit comment" +#~ msgstr "コメントを反映します" + +#~ msgid "Server does not support changesets" +#~ msgstr "サーバは変更した設定をサポートしていません" + +#~ msgid "Unsaved Changes" +#~ msgstr "保存されていない変更" + +#~ msgid "Open in Browser" +#~ msgstr "ブラウザで開く" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSMオンラインヘルプ" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "{1}からプラグイン: {0}をダウンロードできません" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}" + +#~ msgid "Found element in non-way." +#~ msgstr "ウエイ以外で要素が見つかりました" + +#~ msgid "Unknown version" +#~ msgstr "バージョン番号は不明です" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し" +#~ "て試してください。" + +#~ msgid "Found element in non-relation." +#~ msgstr "要素がリレーション以外に見つかりました" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" + +#~ msgid "Ill-formed node id" +#~ msgstr "III-形式のノードID" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "エラーのため転送が中断しました（５秒待ちます）：" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま" +#~ "す。" + +#~ msgid "Please enter a search string" +#~ msgstr "検索文字列を入力してください" + +#~ msgid "Cannot read place search results from server" +#~ msgstr "地名検索結果をサーバから読み取ることができませんでした" + +#~ msgid "name" +#~ msgstr "名前" + +#~ msgid "zoom" +#~ msgstr "ズーム" + +#~ msgid "Revert" +#~ msgstr "取り消す" + +#~ msgid "Layers: {0}" +#~ msgstr "レイヤー：{0}" + +#~ msgid " has zero ref" +#~ msgstr " はゼロ参照です。" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "OSMサーバに接続…" + +#~ msgid "Authors: {0}" +#~ msgstr "作者: {0}" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSMアカウントのログイン名（email)" + +#~ msgid "OSM username (email)" +#~ msgstr "OSMユーザ名（email）" + +#~ msgid "Error while parsing" +#~ msgstr "解析中にエラー" + +#~ msgid "File not found" +#~ msgstr "ファイルが見つかりません" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" +#~ "ウンロードしますか？\n" +#~ "{0}" + +#~ msgid "Plugin already exists" +#~ msgstr "プラグインはすでに存在しています" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error deleting plugin file: {0}" + +#~ msgid "Rotate" +#~ msgstr "回転" + +#~ msgid "Change" +#~ msgstr "更新" + +#~ msgid "Delete {1} {0}" +#~ msgstr "削除 {1} {0}" + +#~ msgid "true" +#~ msgstr "真" + +#~ msgid "false" +#~ msgstr "偽" + +#~ msgid "position" +#~ msgstr "位置" + +#~ msgid "different" +#~ msgstr "差異" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "情報ディレクトリを読み取れません: {0}" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Empty member in relation." +#~ msgstr "リレーションに登録すべきものがありません。" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "unnamed" +#~ msgstr "名前なし" + +#~ msgid "Only two nodes allowed" +#~ msgstr "二つだけのノード選択が許されています" + +#~ msgid "Only one node selected" +#~ msgstr "ただ一つだけのノードが選択されています。" + +#~ msgid "Import TCX File..." +#~ msgstr "TCXファイルをインポート" + +#~ msgid "Show Tile Status" +#~ msgstr "タイルの状態を表示" + +#~ msgid "Request Update" +#~ msgstr "要求の更新" + +#~ msgid "error loading metadata" +#~ msgstr "メタデータの読み込みエラー" + +#~ msgid "requested: {0}" +#~ msgstr "要求: {0}" + +#~ msgid "error requesting update" +#~ msgstr "アップデート要求時にエラー" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Tableau d'Assemblageを選択" + +#~ msgid "Public" +#~ msgstr "公開" + +#~ msgid "Show Author Panel" +#~ msgstr "作者パネルを表示" + +#~ msgid "Open User Page" +#~ msgstr "ユーザページを開く" + +#~ msgid "Open User Page in browser" +#~ msgstr "ブラウザでユーザページを開く" + +#~ msgid "Select User's Data" +#~ msgstr "ユーザのデータを選択" + +#~ msgid "Please select some data" +#~ msgstr "データを選択してください" + +#~ msgid "help" +#~ msgstr "ヘルプ" + +#~ msgid "Help / About" +#~ msgstr "ヘルプ/情報" + +#~ msgid "WMS Plugin Help" +#~ msgstr "WMSプラグイン　ヘルプ" + +#~ msgid "Navigation" +#~ msgstr "ナビゲーション" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +# http://en.wikipedia.org/wiki/Draw_bridge +#~ msgid "Drawbridge" +#~ msgstr "跳ね橋" + +# http://en.wikipedia.org/wiki/Portcullis +#~ msgid "Portcullis" +#~ msgstr "城の格子戸" + +#~ msgid "Station" +#~ msgstr "駅" + +#~ msgid "Edit Station" +#~ msgstr "駅の編集" + +#~ msgid "map" +#~ msgstr "マップ" + +#~ msgid "citymap" +#~ msgstr "街路地図" + +#~ msgid "hikingmap" +#~ msgstr "ハイキングマップ" + +#~ msgid "bicyclemap" +#~ msgstr "自転車マップ" + +#~ msgid "sports" +#~ msgstr "スポーツ店" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "タグ（空の値でタグ自身を削除）" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "この関連から現在の行のメンバーを削除" + +#~ msgid "Error parsing server response." +#~ msgstr "サーバからの応答内容が不正です。" + +#~ msgid "Object" +#~ msgstr "オブジェクト" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン" +#~ "へと戻します。" + +#~ msgid "Tagging preset source" +#~ msgstr "事前に設定した情報源をタグ付け" + +#~ msgid "Tagging preset sources" +#~ msgstr "事前設定の情報源をタグ付け" + +#~ msgid "my version:" +#~ msgstr "私のバージョン:" + +#~ msgid "their version:" +#~ msgstr "相手のバージョン:" + +#~ msgid "resolved version:" +#~ msgstr "解決したバージョン:" + +#~ msgid "Unknown file extension." +#~ msgstr "ファイルの拡張子が不明です" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "TCXファイルをTCXファイルとしてインポート" + +#~ msgid "Validate" +#~ msgstr "検証" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "現在の選択か、全てのデータ一式の検証" + +#~ msgid "Open a layer first (GPX, OSM, cache)" +#~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)" + +#~ msgid "Please select the row to copy." +#~ msgstr "コピーする列を選択してください。" + +#~ msgid "board" +#~ msgstr "board" + +#~ msgid "History of Element" +#~ msgstr "要素の履歴" + +#~ msgid "Error while loading page {0}" +#~ msgstr "ページ{0}を読み込む際にエラーが発生しました。" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "プリセット \"{0}\"を使います" + +#~ msgid "Remove Selected" +#~ msgstr "選択の削除" + +#~ msgid "Basic" +#~ msgstr "基本" + +#~ msgid "rectifier id={0}" +#~ msgstr "修正子 ID={0}" + +#~ msgid "All the ways were empty" +#~ msgstr "ウェイが全て空です。" + +#~ msgid "Please select at least one task to download" +#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。" + +#~ msgid "viaduct" +#~ msgstr "高架橋" + +#~ msgid "Charge" +#~ msgstr "料金" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ" +#~ "い。" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "投影法\"{0}\"は、緯度が46.1°から57°の\n" +#~ "間で使われるように設計されています。\n" +#~ "フランスのWMSサーバをつかうのではなければ、\n" +#~ "ほかの投影法を使用してください。\n" +#~ "本メッセージ後は、データのアップロードはやめてください。" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま" +#~ "すか？" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "異なるメンバーであるウェイを結合しますか？" + +#~ msgid "No document open so nothing to save." +#~ msgstr "一つも開かれたデータがありませんんで、保存されません。" + +#~ msgid "Please select one or more closed ways of at least four nodes." +#~ msgstr "" +#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワード" +#~ "は、URLに付加されて平文でサーバに送信されます。
他で使用しているパス" +#~ "ワードは使用しないでください。" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押" +#~ "した状態で移動させる。選択：クリック。" + +#~ msgid "Occupied By" +#~ msgstr "次によって占められる;" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xmlかWikiページを追加する。" + +#~ msgid "Delete and Download" +#~ msgstr "削除とダウンロード" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" +#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} 個のオブジェクトが競合しています:" + +#~ msgid "Conflicting relation" +#~ msgstr "競合中のリレーション" + +#~ msgid "There were conflicts during import." +#~ msgstr "インポート中に競合を発見しました。" + +#~ msgid "Merging conflicts." +#~ msgstr "競合点の統合" + +#~ msgid "Conflicts: {0}" +#~ msgstr "競合: {0}" + +#~ msgid "Move Down" +#~ msgstr "下に移動" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "関連の編集者:{0}" + +#~ msgid "Move Up" +#~ msgstr "上に移動" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "新しいタグプリセット源をリストに追加する。" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "ノードの一部は（ほぼ）一直線上にある" + +#~ msgid "Update Data" +#~ msgstr "データの更新" + +# http://en.wikipedia.org/wiki/Draw_bridge +#~ msgid "Edit Drawbridge" +#~ msgstr "跳ね橋の編集" + +#~ msgid "Merge Anyway" +#~ msgstr "強制的に結合" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "異なったメンバーになっているノードを結合しますか？" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" +#~ "してください。" + +#~ msgid "Combine Anyway" +#~ msgstr "強制的に連結。" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "ほぼ垂直になっているウェイを選択してください。" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ" +#~ "ロードされた要素だけに遍歴があります。" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている" +#~ "か、ダウンロードしましたか？" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" + +#~ msgid "Upload to OSM..." +#~ msgstr "OSMにアップロード" + +#~ msgid "Sorry, doesn't work with anonymous users" +#~ msgstr "申し訳ありません。匿名のユーザでは利用できません。" + +#~ msgid "Invalid projection" +#~ msgstr "投影法が無効" + +#~ msgid "Replaces Selection with Users data" +#~ msgstr "ユーザデータを選択したものに置き替えます。" + +#~ msgid "Please choose a user using the author panel" +#~ msgstr "著作者パネルを使用してユーザを選んでください。" + +#~ msgid "Continue anyway" +#~ msgstr "とりあえず続ける" + +#~ msgid "Change the projection to {0} first." +#~ msgstr "最初に投影法を {0} に変えてください。" + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "直接JOSMからのTCXファイルをロードしてください。" + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ" +#~ "ダーを調整して、手動で写真に合わせることができます。" + +#~ msgid "Map Type" +#~ msgstr "マップタイプ" + +#~ msgid "Edit Information Office" +#~ msgstr "案内所の編集" + +#~ msgid "Remove route nodes" +#~ msgstr "ルートノードの削除" + +#~ msgid "Edit Portcullis" +#~ msgstr "城の格子戸の編集" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "米Yahoo (WebKit GTK)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "米Yahoo (GNOME Fix)" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "投影法 \"{0}\" は、\n" +#~ "緯度 45.7°から 47.9°で\n" +#~ "経度 5.7°から 10.6°まで用です。\n" +#~ "スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n" +#~ "違う投影系を使ってください。\n" +#~ "このメッセージ以降のデータはアップロードしないでください。" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "OSMデータにバージョン番号が欠けています。" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "不明な理由でデータのアップロードに失敗しました。" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "応答から数値を読み取れません。" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" + +#~ msgid "" +#~ "(You can change the number of days after which this warning appears
by " +#~ "setting the config option 'pluginmanager.warntime'.)" +#~ msgstr "" +#~ "（この警告が何日で表示されるかは
設定オプションの'pluginmanager." +#~ "warntime'を編集することで変更できます）" + +#~ msgid "" +#~ "WARNING: launching browser windows for the first {0} of {1} selected " +#~ "primitives only" +#~ msgstr "" +#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初" +#~ "の{0}だけです。" + +#~ msgid "Download referrers..." +#~ msgstr "参照をダウンロード..." + +#~ msgid "" +#~ "There are unsaved changes in {0} layer. Discard the changes and continue?" +#~ msgid_plural "" +#~ "There are unsaved changes in {0} layers. Discard the changes and continue?" +#~ msgstr[0] "" +#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?" + +#~ msgid "Close current changeset" +#~ msgstr "現在の変更セットを閉じる" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "新しい変更セットを使用して閉じる" + +#~ msgid "" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" +#~ msgstr "" +#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後" +#~ "に変更セットを閉じる" + +#~ msgid "Use the existing changeset {0} and close it after upload" +#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to close the changeset " +#~ "after this upload" +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ" +#~ "トを閉じる" + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく" + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to leave the changeset " +#~ "open for further uploads" +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた" +#~ "めに変更セットを開いておく" + +#~ msgid "Changeset {0} is unchanged. Skipping update." +#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。" + +#~ msgid "No currently open changeset. Opening a new changeset..." +#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..." + +#~ msgid "Reusing existing changeset {0}" +#~ msgstr "既存の変更セット {0} を再利用しています" + +#~ msgid "" +#~ "Warning: could not reuse an existing changeset as requested. Opening a " +#~ "new one." +#~ msgstr "" +#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" + +#~ msgid "" +#~ "Failed to update changeset. Either there is no current changeset or the " +#~ "id of the current changeset is 0" +#~ msgstr "" +#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" +#~ "セットのIDが 0 です。" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" + +#~ msgid "Updates the currently selected primitives from the server" +#~ msgstr "サーバから現在選択されたプリミティブを更新" + +#~ msgid "Upload to OSM API failed" +#~ msgstr "OSM API へのアップロード失敗" + #~ msgid "Can't search because there is no loaded data." #~ msgstr "データがロードされていないので検索できません。" -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "この履歴にはバージョン {0} のプリミティブはありません" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "前のバージョンがありません。履歴は空です。" - -#~ msgid "No latest version found. History is empty." -#~ msgstr "最新のバージョンがありません。履歴は空です。" - -#~ msgid "No type found. History is empty." -#~ msgstr "種別が見つかりません。履歴は空です。" - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "このデータセットには id {0} のプリミティブはありません" +#~ msgid "Conflict detected" +#~ msgstr "競合が検出されました" + +#~ msgid "" +#~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " +#~ "relation?" +#~ msgstr "" +#~ "選択 \"{0}\" はリレーション \"{1}\" で使用されています。
リレー" +#~ "ションから削除しますか？" #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" @@ -27413,18 +28283,156 @@ #~ "このデータセットには id {0} バージョン {1} のプリミティブはありません" +#~ msgid "Primitive already deleted" +#~ msgstr "プリミティブは削除済み" + +#~ msgid "" +#~ "Uploading failed because a primitive you tried " +#~ "to
delete on the server is already deleted.

The error message " +#~ "is:
{0}" +#~ msgstr "" +#~ "アップロード 失敗 サーバから削除しようとしたプリミ" +#~ "ティブは既に削除されています。

エラーメッセージ:
{0}" + +#~ msgid "not yet decided" +#~ msgstr "未決定です" + +#~ msgid "History item" +#~ msgstr "履歴アイテム" + +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "パラメータ '{0}' はヌル以外でなければなりません" + +#~ msgid "Defaults (See tooltip for detailed information)" +#~ msgstr "デフォルト(詳細はツールチップ参照)" + +#~ msgid "Add a new XML source to the list." +#~ msgstr "リストに新しいXML ソースを追加。" + +#~ msgid "Copy defaults" +#~ msgstr "デフォルトをコピー" + +#~ msgid "Reached the end of the line" +#~ msgstr "ラインの終端に到達" + +#~ msgid "Reached a junction" +#~ msgstr "ジャンクションに到達" + +#~ msgid "Purging 1 primitive" +#~ msgstr "1 つのプリミティブを破棄" + +#~ msgid "" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" +#~ msgstr "" +#~ "選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま" +#~ "す。
リレーションから削除しますか?" + +#~ msgid "removing reference from way {0}" +#~ msgstr "ウェイ {0}から、参照を取り除く" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "" +#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし" +#~ "た。" + #~ msgid "Select a starting node on the end of a way" #~ msgstr "ウェイ終端の開始ノードを選択" -#~ msgid "Reached the end of the line" -#~ msgstr "ラインの終端に到達" - -#~ msgid "Reached a junction" -#~ msgstr "ジャンクションに到達" - -#~ msgid "help" -#~ msgstr "ヘルプ" - -#~ msgid "Help / About" -#~ msgstr "ヘルプ/情報" +#~ msgid "The XML source (URL or filename) for {0} definition files." +#~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。" + +#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" +#~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''" + +#~ msgid "paramete''{0}'' must not be null" +#~ msgstr "パラメータ''{0}'' はヌルでなければなりません" + +#~ msgid "Missing mandatory attribute ''{0}''" +#~ msgstr "必要な属性 ''{0}'' がありません" + +#~ msgid "Replace" +#~ msgstr "置換" + +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が" +#~ "見つかりません。" + +#~ msgid "Help page missing. Create it in English." +#~ msgstr "" +#~ "ヘルプページがありません。英語で作成してください。" + +#~ msgid "" +#~ "Help page missing. Create it in English or your language." +#~ msgstr "" +#~ "ヘルプページがありません。英語 または " +#~ "あなたの言語で作成してください。" + +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "このデータセットには id {0} のプリミティブはありません" + +#~ msgid "Helppage missing. Create it in English." +#~ msgstr "" +#~ "ヘルプページがありません。英語でそれを作成してくださ" +#~ "い。" + +#~ msgid "" +#~ "Helppage missing. Create it in English or your language." +#~ msgstr "" +#~ "ヘルプページがありません。英語もしくは" +#~ "あなたの母国語でそれを作成してください。" + +#~ msgid "Unexpected return value. Got {0}." +#~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。" + +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "この履歴にはバージョン {0} のプリミティブはありません" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "前のバージョンがありません。履歴は空です。" + +#~ msgid "No latest version found. History is empty." +#~ msgstr "最新のバージョンがありません。履歴は空です。" + +#~ msgid "Index out of bounds. Got {0}." +#~ msgstr "範囲外のインデックス。{0} を受け取りました" + +#~ msgid "Display the history of the selected primitive." +#~ msgstr "選択されたプリミティブの履歴を表示" + +#~ msgid "" +#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." +#~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" + +#~ msgid "" +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." +#~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" + +#~ msgid "Preset group ''{0}'' of group ''{1}''" +#~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''" + +#~ msgid "" +#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " +#~ "to default geometry. Details: {1}" +#~ msgstr "" +#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの" +#~ "geometry にフォールバックします。詳細: {1}" + +#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" +#~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)" + +#~ msgid "Processing {0}" +#~ msgstr "{0} 実行中" + +#~ msgid "Relation: from {0} to {1} via {2}" +#~ msgstr "リレーション: {0} から {1} まで {2} 経由" #~ msgid "" @@ -27474,840 +28482,4 @@ #~ "い。" -#~ msgid "WMS Plugin Help" -#~ msgstr "WMSプラグイン　ヘルプ" - -#~ msgid "Move" -#~ msgstr "移動" - -#~ msgid "File could not be found." -#~ msgstr "ファイルは存在しませんでした。" - -#~ msgid "No data imported." -#~ msgstr "データーはインポートされませんでした。" - -#~ msgid "Data Layer" -#~ msgstr "データレイヤー" - -#~ msgid "Select a bookmark first." -#~ msgstr "最初にブックマークを選択してください、" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "最初に目的の座標を入力してください。" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。" - -#~ msgid "Date" -#~ msgstr "日付" - -#~ msgid "Cannot connect to server." -#~ msgstr "サーバに接続できません。" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "リストを更新するために再読込のクリック" - -#~ msgid "Refresh the selection list." -#~ msgstr "選択したリストを更新する。" - -#~ msgid "Commit comment" -#~ msgstr "コメントを反映します" - -#~ msgid "Server does not support changesets" -#~ msgstr "サーバは変更した設定をサポートしていません" - -#~ msgid "Unsaved Changes" -#~ msgstr "保存されていない変更" - -#~ msgid "Open in Browser" -#~ msgstr "ブラウザで開く" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSMオンラインヘルプ" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "" -#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "{1}からプラグイン: {0}をダウンロードできません" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}" - -#~ msgid "Found element in non-way." -#~ msgstr "ウエイ以外で要素が見つかりました" - -#~ msgid "Unknown version" -#~ msgstr "バージョン番号は不明です" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し" -#~ "て試してください。" - -#~ msgid "Found element in non-relation." -#~ msgstr "要素がリレーション以外に見つかりました" - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" - -#~ msgid "Ill-formed node id" -#~ msgstr "III-形式のノードID" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "エラーのため転送が中断しました（５秒待ちます）：" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "" -#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま" -#~ "す。" - -#~ msgid "Please enter a search string" -#~ msgstr "検索文字列を入力してください" - -#~ msgid "Cannot read place search results from server" -#~ msgstr "地名検索結果をサーバから読み取ることができませんでした" - -#~ msgid "name" -#~ msgstr "名前" - -#~ msgid "zoom" -#~ msgstr "ズーム" - -#~ msgid "Revert" -#~ msgstr "取り消す" - -#~ msgid "Layers: {0}" -#~ msgstr "レイヤー：{0}" - -#~ msgid " has zero ref" -#~ msgstr " はゼロ参照です。" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "OSMサーバに接続…" - -#~ msgid "Authors: {0}" -#~ msgstr "作者: {0}" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSMアカウントのログイン名（email)" - -#~ msgid "OSM username (email)" -#~ msgstr "OSMユーザ名（email）" - -#~ msgid "Error while parsing" -#~ msgstr "解析中にエラー" - -#~ msgid "File not found" -#~ msgstr "ファイルが見つかりません" - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" -#~ "ウンロードしますか？\n" -#~ "{0}" - -#~ msgid "Plugin already exists" -#~ msgstr "プラグインはすでに存在しています" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - -#~ msgid "Rotate" -#~ msgstr "回転" - -#~ msgid "Change" -#~ msgstr "更新" - -#~ msgid "Delete {1} {0}" -#~ msgstr "削除 {1} {0}" - -#~ msgid "true" -#~ msgstr "真" - -#~ msgid "false" -#~ msgstr "偽" - -#~ msgid "position" -#~ msgstr "位置" - -#~ msgid "different" -#~ msgstr "差異" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "情報ディレクトリを読み取れません: {0}" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Empty member in relation." -#~ msgstr "リレーションに登録すべきものがありません。" - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "unnamed" -#~ msgstr "名前なし" - -#~ msgid "Only two nodes allowed" -#~ msgstr "二つだけのノード選択が許されています" - -#~ msgid "Only one node selected" -#~ msgstr "ただ一つだけのノードが選択されています。" - -#~ msgid "Import TCX File..." -#~ msgstr "TCXファイルをインポート" - -#~ msgid "Show Tile Status" -#~ msgstr "タイルの状態を表示" - -#~ msgid "Request Update" -#~ msgstr "要求の更新" - -#~ msgid "error loading metadata" -#~ msgstr "メタデータの読み込みエラー" - -#~ msgid "requested: {0}" -#~ msgstr "要求: {0}" - -#~ msgid "error requesting update" -#~ msgstr "アップデート要求時にエラー" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Tableau d'Assemblageを選択" - -#~ msgid "Public" -#~ msgstr "公開" - -#~ msgid "Show Author Panel" -#~ msgstr "作者パネルを表示" - -#~ msgid "Open User Page" -#~ msgstr "ユーザページを開く" - -#~ msgid "Open User Page in browser" -#~ msgstr "ブラウザでユーザページを開く" - -#~ msgid "Select User's Data" -#~ msgstr "ユーザのデータを選択" - -#~ msgid "Please select some data" -#~ msgstr "データを選択してください" - -#~ msgid "Navigation" -#~ msgstr "ナビゲーション" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -# http://en.wikipedia.org/wiki/Draw_bridge -#~ msgid "Drawbridge" -#~ msgstr "跳ね橋" - -# http://en.wikipedia.org/wiki/Portcullis -#~ msgid "Portcullis" -#~ msgstr "城の格子戸" - -#~ msgid "Station" -#~ msgstr "駅" - -#~ msgid "Edit Station" -#~ msgstr "駅の編集" - -#~ msgid "map" -#~ msgstr "マップ" - -#~ msgid "citymap" -#~ msgstr "街路地図" - -#~ msgid "hikingmap" -#~ msgstr "ハイキングマップ" - -#~ msgid "bicyclemap" -#~ msgstr "自転車マップ" - -#~ msgid "sports" -#~ msgstr "スポーツ店" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "タグ（空の値でタグ自身を削除）" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "この関連から現在の行のメンバーを削除" - -#~ msgid "Error parsing server response." -#~ msgstr "サーバからの応答内容が不正です。" - -#~ msgid "Object" -#~ msgstr "オブジェクト" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン" -#~ "へと戻します。" - -#~ msgid "Tagging preset source" -#~ msgstr "事前に設定した情報源をタグ付け" - -#~ msgid "Tagging preset sources" -#~ msgstr "事前設定の情報源をタグ付け" - -#~ msgid "my version:" -#~ msgstr "私のバージョン:" - -#~ msgid "their version:" -#~ msgstr "相手のバージョン:" - -#~ msgid "resolved version:" -#~ msgstr "解決したバージョン:" - -#~ msgid "Unknown file extension." -#~ msgstr "ファイルの拡張子が不明です" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "TCXファイルをTCXファイルとしてインポート" - -#~ msgid "Validate" -#~ msgstr "検証" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "現在の選択か、全てのデータ一式の検証" - -#~ msgid "Open a layer first (GPX, OSM, cache)" -#~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)" - -#~ msgid "Please select the row to copy." -#~ msgstr "コピーする列を選択してください。" - -#~ msgid "board" -#~ msgstr "board" - -#~ msgid "History of Element" -#~ msgstr "要素の履歴" - -#~ msgid "Error while loading page {0}" -#~ msgstr "ページ{0}を読み込む際にエラーが発生しました。" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "プリセット \"{0}\"を使います" - -#~ msgid "Remove Selected" -#~ msgstr "選択の削除" - -#~ msgid "Basic" -#~ msgstr "基本" - -#~ msgid "rectifier id={0}" -#~ msgstr "修正子 ID={0}" - -#~ msgid "All the ways were empty" -#~ msgstr "ウェイが全て空です。" - -#~ msgid "Please select at least one task to download" -#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。" - -#~ msgid "viaduct" -#~ msgstr "高架橋" - -#~ msgid "Charge" -#~ msgstr "料金" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ" -#~ "い。" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "投影法\"{0}\"は、緯度が46.1°から57°の\n" -#~ "間で使われるように設計されています。\n" -#~ "フランスのWMSサーバをつかうのではなければ、\n" -#~ "ほかの投影法を使用してください。\n" -#~ "本メッセージ後は、データのアップロードはやめてください。" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま" -#~ "すか？" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "異なるメンバーであるウェイを結合しますか？" - -#~ msgid "No document open so nothing to save." -#~ msgstr "一つも開かれたデータがありませんんで、保存されません。" - -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "" -#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier image id" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワード" -#~ "は、URLに付加されて平文でサーバに送信されます。
他で使用しているパス" -#~ "ワードは使用しないでください。" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押" -#~ "した状態で移動させる。選択：クリック。" - -#~ msgid "Occupied By" -#~ msgstr "次によって占められる;" - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "site-josm.xmlかWikiページを追加する。" - -#~ msgid "Delete and Download" -#~ msgstr "削除とダウンロード" - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" -#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} 個のオブジェクトが競合しています:" - -#~ msgid "Conflicting relation" -#~ msgstr "競合中のリレーション" - -#~ msgid "There were conflicts during import." -#~ msgstr "インポート中に競合を発見しました。" - -#~ msgid "Merging conflicts." -#~ msgstr "競合点の統合" - -#~ msgid "Conflicts: {0}" -#~ msgstr "競合: {0}" - -#~ msgid "Move Down" -#~ msgstr "下に移動" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "関連の編集者:{0}" - -#~ msgid "Move Up" -#~ msgstr "上に移動" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "新しいタグプリセット源をリストに追加する。" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "ノードの一部は（ほぼ）一直線上にある" - -#~ msgid "Update Data" -#~ msgstr "データの更新" - -# http://en.wikipedia.org/wiki/Draw_bridge -#~ msgid "Edit Drawbridge" -#~ msgstr "跳ね橋の編集" - -#~ msgid "Merge Anyway" -#~ msgstr "強制的に結合" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "異なったメンバーになっているノードを結合しますか？" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" -#~ "してください。" - -#~ msgid "Combine Anyway" -#~ msgstr "強制的に連結。" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "ほぼ垂直になっているウェイを選択してください。" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ" -#~ "ロードされた要素だけに遍歴があります。" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "" -#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている" -#~ "か、ダウンロードしましたか？" - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" - -#~ msgid "Upload to OSM..." -#~ msgstr "OSMにアップロード" - -#~ msgid "Sorry, doesn't work with anonymous users" -#~ msgstr "申し訳ありません。匿名のユーザでは利用できません。" - -#~ msgid "Invalid projection" -#~ msgstr "投影法が無効" - -#~ msgid "Replaces Selection with Users data" -#~ msgstr "ユーザデータを選択したものに置き替えます。" - -#~ msgid "Please choose a user using the author panel" -#~ msgstr "著作者パネルを使用してユーザを選んでください。" - -#~ msgid "Continue anyway" -#~ msgstr "とりあえず続ける" - -#~ msgid "Change the projection to {0} first." -#~ msgstr "最初に投影法を {0} に変えてください。" - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "直接JOSMからのTCXファイルをロードしてください。" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ" -#~ "ダーを調整して、手動で写真に合わせることができます。" - -#~ msgid "Map Type" -#~ msgstr "マップタイプ" - -#~ msgid "Edit Information Office" -#~ msgstr "案内所の編集" - -#~ msgid "Remove route nodes" -#~ msgstr "ルートノードの削除" - -#~ msgid "Edit Portcullis" -#~ msgstr "城の格子戸の編集" - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "" -#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "米Yahoo (WebKit GTK)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "米Yahoo (GNOME Fix)" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 45.7° and 47.9°\n" -#~ "and longitutes between 5.7° and 10.6° only.\n" -#~ "Use another projection system if you are not working\n" -#~ "on a data set of Switzerland or Liechtenstein.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "投影法 \"{0}\" は、\n" -#~ "緯度 45.7°から 47.9°で\n" -#~ "経度 5.7°から 10.6°まで用です。\n" -#~ "スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n" -#~ "違う投影系を使ってください。\n" -#~ "このメッセージ以降のデータはアップロードしないでください。" - -#~ msgid "Version number missing from OSM data" -#~ msgstr "OSMデータにバージョン番号が欠けています。" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "不明な理由でデータのアップロードに失敗しました。" - -#~ msgid "Cannot read numeric value from response" -#~ msgstr "応答から数値を読み取れません。" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" - -#~ msgid "" -#~ "(You can change the number of days after which this warning appears
by " -#~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "" -#~ "（この警告が何日で表示されるかは
設定オプションの'pluginmanager." -#~ "warntime'を編集することで変更できます）" - -#~ msgid "" -#~ "WARNING: launching browser windows for the first {0} of {1} selected " -#~ "primitives only" -#~ msgstr "" -#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初" -#~ "の{0}だけです。" - -#~ msgid "Download referrers..." -#~ msgstr "参照をダウンロード..." - -#~ msgid "" -#~ "There are unsaved changes in {0} layer. Discard the changes and continue?" -#~ msgid_plural "" -#~ "There are unsaved changes in {0} layers. Discard the changes and continue?" -#~ msgstr[0] "" -#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?" - -#~ msgid "Close current changeset" -#~ msgstr "現在の変更セットを閉じる" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "新しい変更セットを使用して閉じる" - -#~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the " -#~ "changeset open after the upload" -#~ msgstr "" -#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後" -#~ "に変更セットを閉じる" - -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to close the changeset " -#~ "after this upload" -#~ msgstr "" -#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ" -#~ "トを閉じる" - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to leave the changeset " -#~ "open for further uploads" -#~ msgstr "" -#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた" -#~ "めに変更セットを開いておく" - -#~ msgid "Changeset {0} is unchanged. Skipping update." -#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。" - -#~ msgid "No currently open changeset. Opening a new changeset..." -#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..." - -#~ msgid "Reusing existing changeset {0}" -#~ msgstr "既存の変更セット {0} を再利用しています" - -#~ msgid "" -#~ "Warning: could not reuse an existing changeset as requested. Opening a " -#~ "new one." -#~ msgstr "" -#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" - -#~ msgid "" -#~ "Failed to update changeset. Either there is no current changeset or the " -#~ "id of the current changeset is 0" -#~ msgstr "" -#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" -#~ "セットのIDが 0 です。" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" - -#~ msgid "Updates the currently selected primitives from the server" -#~ msgstr "サーバから現在選択されたプリミティブを更新" - -#~ msgid "Upload to OSM API failed" -#~ msgstr "OSM API へのアップロード失敗" - -#~ msgid "Conflict detected" -#~ msgstr "競合が検出されました" - -#~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " -#~ "relation?" -#~ msgstr "" -#~ "選択 \"{0}\" はリレーション \"{1}\" で使用されています。
リレー" -#~ "ションから削除しますか？" - -#~ msgid "Primitive already deleted" -#~ msgstr "プリミティブは削除済み" - -#~ msgid "" -#~ "Uploading failed because a primitive you tried " -#~ "to
delete on the server is already deleted.

The error message " -#~ "is:
{0}" -#~ msgstr "" -#~ "アップロード 失敗 サーバから削除しようとしたプリミ" -#~ "ティブは既に削除されています。

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

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

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

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

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

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

Feilmelding:
{0}" - -#~ msgid "parameter '{0}' must not be null" -#~ msgstr "parameter «{0}» må ha en verdi" - -#~ msgid "Apply partial resolutions" -#~ msgstr "Bruk ufullstendige løsninger" - -#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." - -#~ msgid "History item" -#~ msgstr "Historikkobjekt" - #~ msgid "Layer {0} must be in list of layers" #~ msgstr "Lag {0} må være i listen over lag" @@ -28008,4 +28141,7 @@ #~ "HREF=\"{1}\">norsk (bokmål)." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "Hjelp mangler. Kan lages i English." @@ -28021,4 +28157,16 @@ #~ msgstr "Uventet returverdi. Mottok {0}." +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Denne historikken har ikke noe element med versjon {0}" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "Fant ingen første versjon. Historikken er tom." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "Fant ingen siste versjon. Historikken er tom." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "Indeks er utenfor rekkevidde: {0}" Index: applications/editors/josm/i18n/po/nl.po =================================================================== --- applications/editors/josm/i18n/po/nl.po (revision 18772) +++ applications/editors/josm/i18n/po/nl.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:13+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 17:29+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Dutch \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ongeldige URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Waarschuwing" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ongeldige bestands-URL negeren: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kon bestand ''{0}' niet lezen'.
Error is:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kon bestand ''{0}' niet lezen'.
Error is:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Fout" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -308,5 +309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -315,27 +316,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -353,5 +354,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Annuleren" @@ -362,19 +363,19 @@ "Selecteer minstens één reeds opgeladen knooppunt, weg of relatie a.u.b." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Selecteer de doellaag" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Selecteer de doellaag" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Samenvoegen" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -383,5 +384,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Geen doel lagen" @@ -494,13 +495,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -598,20 +599,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Bestand: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -651,10 +652,10 @@ "reeks van knopen)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0} wegen combineren" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Selecteer twee of meer wegen om te combineren." @@ -700,10 +701,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -722,11 +723,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Overschrijven?" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Bestand bestaat al. Overschrijven?" @@ -773,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -780,6 +781,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -795,7 +796,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -823,5 +823,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Dupliceren" @@ -845,30 +845,30 @@ msgstr "De applicatie afsluiten." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Alle formaten" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exporteren naar GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "De gegevens naar een GPX-bestand exporteren." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Geen gegevens om te exporteren, maak deze eerst." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -876,13 +876,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -901,8 +901,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -910,7 +910,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -933,9 +933,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -947,5 +947,5 @@ msgstr "Parameter \"{0}\" mag niet leeg zijn." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -953,5 +953,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Export GPX bestand" @@ -1097,6 +1097,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nieuw" @@ -1225,5 +1225,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Plakken" @@ -1311,11 +1311,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Opslaan" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Huidige gegevens opslaan." @@ -1372,10 +1372,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Opslaan als..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "De huidige gegevens in een nieuw bestand opslaan." @@ -1394,30 +1394,30 @@ "incomplete objecten geselecteerd." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Statusrapport tonen" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" "Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Hulp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Klembord kopiëren en sluiten" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1587,5 +1587,5 @@ msgstr "Ongebonden knoop" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1593,5 +1593,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1638,55 +1638,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Selectie updaten" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Update selectie" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Geselecteerde objecten naar klembord kopiëren" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Selectie leeg" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Selectie updaten" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Upload data" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1697,5 +1694,5 @@ "op te lossen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1703,29 +1700,29 @@ msgstr "Geen aanpassingen aanwezig om te uploaden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Niets om te uploaden. Creëer eerst gegevens." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 -#, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 #, java-format msgid "Synchronize relation {0} only" msgstr "Synchroniseer alleen relatie {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synchroniseer alle gegevens" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1739,11 +1736,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Conflicten gedetecteerd" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1754,5 +1751,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1762,22 +1759,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1788,19 +1785,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1809,5 +1806,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1816,15 +1813,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1936,17 +1933,17 @@ msgstr "Langzaam vooruit" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "GPS-gegevens worden gedownload" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Gedownloade GPX-gegevens" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Gegevens worden gedownload" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1954,5 +1951,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "Geen data in dit gebied gevonden." @@ -2006,9 +2003,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Fouten tijdens download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2026,5 +2023,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2032,5 +2029,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2127,22 +2124,18 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 +msgid "Draw a rectangle of the desired size, then release the mouse button." msgstr "" "Een rechthoek met de gewenste grootte tekenen, vervolgens de muisknop " "loslaten." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Een rechthoek met de gewenste grootte tekenen, vervolgens de muisknop " -"loslaten." - #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Een wegsegment verslepen om een rechthoek te maken." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2156,5 +2149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2174,17 +2167,17 @@ msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Verplaats elementen" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Verplaatsing ongedaan maken" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2194,13 +2187,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2209,9 +2202,9 @@ "met dichtstbijzijnde knoop." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "De muisknop loslaten om het roteren te stoppen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2221,15 +2214,15 @@ "roteert selectie; of verander selectie" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zoom en verplaats kaart" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2239,10 +2232,10 @@ "omlaag, rechts; verplaats met rechter knop" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Zoeken..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2251,58 +2244,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Voer een zoekopdracht in:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "Reguliere expressie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "Selectie vervangen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "Toevoegen aan selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "Verwijderen uit selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "Hoofdlettergevoelig" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "Reguliere expressie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Lange straat - 'Lange' en 'straat' in een sleutel of naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Lange straat\" - 'Lange' en 'straat' in een sleutel of naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Lange - 'Lang' ergens in de naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - sleutel 'type' met exacte waarde 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2312,34 +2304,34 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Lange - geen 'Lang' in de naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - sleutel=foot, met een willekeurige waarde." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Speciale zoekopdrachten:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - objecttype (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "gebruiker:... - alle objecten veranderd door gebruiker" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - object met opgegeven aantal knopen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2347,44 +2339,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - alle aangepaste objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - alle geselecteerde objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle incomplete objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "ongetagd - alle objecten zonder tag" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "Gebruik | of OR om te combineren met een logische OR" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Gebruik \" om operanten aan te halen (b.v. als sleutel \":\" bevat)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Gebruik \" om operanten aan te halen (b.v. als sleutel \":\" bevat)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "Gebruik ( en ) om expressies te groeperen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2394,51 +2386,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Start zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Geen overeenkomst gevonden voor ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "{0} overeenkomsten gevonden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2456,40 +2448,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Onverwacht token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Ontbrekende argumenten voor OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Ontbrekend argument voor NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Sluithaak verwacht." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2498,9 +2490,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2509,5 +2501,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2609,7 +2601,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2719,5 +2711,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Dubbel conflict" @@ -2742,5 +2734,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2748,6 +2740,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2817,18 +2809,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Conflicten in verwijderde toestand oplossen in {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2861,10 +2843,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2897,20 +2879,20 @@ msgstr "Volgorde" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2932,10 +2914,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2980,5 +2962,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nieuwe waarde" @@ -3025,7 +3007,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Parameter ''{0}'' mag niet null zijn" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3034,10 +3016,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Configuratiebestand is verminkt in regels {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3046,5 +3028,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3053,5 +3035,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3060,5 +3042,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3067,5 +3049,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3073,5 +3055,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3080,5 +3062,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3087,5 +3069,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3094,5 +3076,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3101,10 +3083,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3185,25 +3167,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "Z" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3211,5 +3193,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3217,5 +3199,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3225,26 +3207,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Ontbrekend argument voor NOT." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3253,5 +3235,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3314,24 +3296,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3339,5 +3321,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3365,10 +3347,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3379,7 +3361,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Parameter ''{0}'' mag niet null zijn" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3533,10 +3515,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Fout: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3548,6 +3530,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3557,5 +3539,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3565,6 +3547,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3582,6 +3564,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "achtergrond" @@ -3599,25 +3581,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"BELANGRIJK: gegevens gepositioneerd ver\n" -"van de huidige Lambert-zonelimieten.\n" -"Upload geen gegevens na deze melding.\n" -"Maak je laatste opdracht ongedaan, sla\n" -"je werk op en start een nieuwe laag in de\n" -"nieuwe zone." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambert-zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3631,26 +3624,52 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Zwitsers raster (Zwitserland)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3665,10 +3684,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Niet meer tonen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3676,32 +3695,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "onvolledig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "snelweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "spoorweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "waterweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "grondgebruik" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3710,5 +3729,5 @@ msgstr[1] "{0} knopen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3746,6 +3765,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflict" @@ -3755,11 +3774,11 @@ msgstr "Onbekende host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3967,11 +3986,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4086,5 +4105,5 @@ msgstr "De lengte van het nieuwe wegsegment dat wordt getekend." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4092,18 +4111,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(geen object)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "laag niet in lijst." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4227,67 +4246,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Eigenschappen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Knopen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Leden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Geen tag-conflicten om op te lossen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags ({0} conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} tag-conflicten om op te lossen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Knopen (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Knopen (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Conflicten in de knopen van deze weg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Leden (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4295,68 +4314,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Leden (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Geen eigenschapsconflicten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Eigenschappen (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Vergelijk " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Mijn versie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4364,5 +4383,5 @@ msgstr "Samengevoegde versie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4370,30 +4389,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Hun versie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> boven" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> beneden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4401,5 +4420,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4407,14 +4426,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4422,5 +4441,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4428,54 +4447,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Omhoog" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Geselecteerde elementen één positie omhoog schuiven" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Omlaag" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Vastzetten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4484,5 +4503,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4491,5 +4510,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4498,5 +4517,5 @@ msgstr[1] "Mijn versie ({0} invoeren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4505,5 +4524,5 @@ msgstr[1] "Samengevoegde versie ({0} invoeren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4512,6 +4531,6 @@ msgstr[1] "Hun versie ({0} invoeren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4520,6 +4539,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4530,5 +4549,5 @@ msgstr "Knoop" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4540,5 +4559,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4547,19 +4566,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4568,9 +4587,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4580,5 +4599,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4602,84 +4621,84 @@ msgstr "Coördinaten:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(geen)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "verwijderd" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "niet verwijderd" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Mijn coördinaten houden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Hun coördinaten houden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4689,17 +4708,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4708,9 +4727,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4725,19 +4744,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4753,10 +4772,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4766,10 +4785,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4796,27 +4815,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4841,22 +4860,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4864,5 +4883,5 @@ msgstr "geen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4953,6 +4972,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4963,5 +4982,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4975,21 +4994,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4997,5 +5016,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5082,10 +5101,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5105,13 +5124,13 @@ msgstr "Opdrachtenlijst: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5119,5 +5138,5 @@ "lijst openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5128,25 +5147,25 @@ "in de bovenstaande lijst." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Opgeloste conflicten toepassen en dialoog sluiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Doorgaan met oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5158,13 +5177,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5176,8 +5195,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5244,5 +5263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5274,34 +5293,34 @@ msgstr "Een lijst met alle geladen lagen openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "De geselecteerde laag verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Tonen/Verbergen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Zichtbaarheid van een laag in- of uitschakelen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "De geselecteerde laag een rij omhoog verplaatsen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "De geselecteerde laag een rij omlaag verplaatsen." @@ -5311,18 +5330,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Dit verandert {0} object." -msgstr[1] "Dit verandert {0} objecten." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Een lege waarde verwijdert de sleutel." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5331,10 +5349,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Waarden aanpassen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5343,5 +5361,5 @@ msgstr[1] "Eigenschappen van {0} objecten aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5350,9 +5368,9 @@ msgstr[1] "Dit verandert {0} objecten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Selecteer een sleutel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Selecteer een waarde" @@ -5376,102 +5394,98 @@ msgstr "Lid van" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Eigenschappen toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Eigenschappen: {0} / Leden: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Eigenschappen / Leden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Relatie wijzigen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Uit relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Selectie uit relatie {0} zeker verwijderen?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "De geselecteerde sleutel in alle objecten verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Eigenschappen verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Eigenschappen bewerken" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Eigenschappen: {0} / Leden: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Eigenschappen / Leden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Relatie wijzigen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Uit relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Selectie uit relatie {0} zeker verwijderen?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "De geselecteerde sleutel in alle objecten verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Eigenschappen verwijderen" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relaties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Een lijst met alle relaties openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relaties: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Een editor voor de geselecteerde relatie openen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "De geselecteerde relatie verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Een nieuwe relatie aanmaken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5500,5 +5514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5510,9 +5524,9 @@ msgstr "Selectie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Laat paneel drijven" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5521,5 +5535,5 @@ "werkbalk." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Klik om de paneelinhoud te verkleinen/vergroten" @@ -5600,12 +5614,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Tegenstrijdigheden in de gegevens" @@ -5623,5 +5637,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5629,5 +5643,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5635,18 +5649,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5655,14 +5669,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5672,9 +5686,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5684,15 +5698,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5700,5 +5714,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5706,20 +5720,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5728,66 +5742,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "De geselecteerde leden omhoog verplaatsen" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "De geselecteerde leden omlaag verplaatsen" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5796,9 +5810,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5807,41 +5821,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Leden downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5851,19 +5865,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "{0} downloaden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5884,10 +5905,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5901,5 +5918,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5969,9 +5986,9 @@ msgstr "Bladwijzers" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5980,52 +5997,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6035,52 +6052,52 @@ "downloaden)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Omvattend gebied" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Gegevensbronnen en -soorten" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap-gegevens" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Rauwe GPS-gegevens" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Als nieuwe laag downloaden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6088,22 +6105,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Gebied downloaden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Downloaden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -6111,17 +6128,17 @@ "server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6143,21 +6160,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Nulwijzeruitzondering, mogelijk ontbreken er wat tags." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6896,8 +6913,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7070,5 +7087,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7080,5 +7097,5 @@ msgstr "Soort" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7125,5 +7142,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7137,5 +7154,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7146,5 +7163,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7153,19 +7170,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7175,32 +7192,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7222,5 +7239,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7282,7 +7299,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "Parameter \"{0}\" mag niet leeg zijn." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7312,33 +7329,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Op probleem inzoomen" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "geschiedenis" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7347,7 +7362,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Voorinstellingenmenu sorteren" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7365,7 +7379,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7405,7 +7418,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anoniem" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7433,12 +7445,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versie {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "verwijderd" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7496,10 +7507,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7710,5 +7721,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7731,17 +7742,17 @@ msgstr "laag" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7757,7 +7768,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7800,29 +7811,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Aanpassingen uploaden" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7830,38 +7841,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Beschrijf kort de veranderingen die je upload:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7869,16 +7880,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7922,24 +7933,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Afbeeldingen van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "GPX inlezen..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Geen tijd voor punt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7947,33 +7958,33 @@ msgstr "Lezen {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Geen afbeeldingen met een leesbare tijd gevonden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geotagged afbeeldingen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS-start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS-einde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "Huidige verschil: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "Tijdzoneverschil: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7982,14 +7993,14 @@ msgstr[1] "afbeeldingen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} binnen de track." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Klok synchroniseren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7997,32 +8008,32 @@ msgstr "JPEG-afbeeldingen (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Afbeelding" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Syncroniseer tijd met GPS-apparaat" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Ingevoerde tijd kon niet worden ontleed." @@ -8112,5 +8123,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8162,10 +8173,10 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Naar gegevenslaag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8175,11 +8186,11 @@ "zijn.
Als je sporen wilt uploaden, kijk dan hier:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8189,29 +8200,29 @@ msgstr "Omgezet van: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Uit OSM langs deze track downloaden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Alles downloaden binnen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} meters" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Maximum oppervlak per verzoek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8222,9 +8233,9 @@ "verder
gaan?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8234,5 +8245,5 @@ "de track zijn overgeslagen of naar de start verplaatst." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8242,23 +8253,23 @@ "kunnen schatten, zijn overgeslagen." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Gegevenslaag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "buiten gedownload gebied" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versie {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8267,5 +8278,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8279,5 +8290,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8290,11 +8301,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8303,22 +8314,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} bestaat uit:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API-versie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Naar GPX-laag omzetten" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Geen \"van\"-weg gevonden." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8415,9 +8439,9 @@ msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Tekst/pictogrammen tonen/verbergen" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." @@ -8483,5 +8507,5 @@ msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8489,5 +8513,5 @@ msgstr "Selecteer een rij om te bewerken." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8495,5 +8519,5 @@ msgstr "Nieuwe waarde voor {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8502,5 +8526,5 @@ msgstr "Selecteer een rij om te verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Nieuw sleutel/waardepaar invoeren" @@ -8640,40 +8664,40 @@ msgstr "Calibratie geluidsopname" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Kleur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Tekenstijl {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Laag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Kies" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Selecteer een kleur voor {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Naar standaardwaarde zetten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Alles naar standaardwaarde zetten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Kleuren gebruikt door verschillende objecten in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Kleuren" @@ -9121,17 +9145,17 @@ msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Coördinaten tonen als" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projectiemethode" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9141,5 +9165,5 @@ msgstr "Kaartprojectie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9197,81 +9221,81 @@ msgstr "Sneltoets" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9280,6 +9304,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9471,10 +9495,10 @@ msgstr "Groepen aanpastoetsen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9484,13 +9508,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9498,18 +9522,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Optionele attributen:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "afgesloten weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Onbekend type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9520,15 +9544,15 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Fout bij ontleden van {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementen van type {0} worden ondersteund." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9538,18 +9562,18 @@ msgstr[1] "{0} objecten wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Selectie is ongeschikt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Voorinstelling toepassen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Eigenschappen veranderen" @@ -9565,6 +9589,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9573,8 +9597,21 @@ msgstr "Met OSM-server verbinden..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Downloaden van punten {0} tot {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9691,11 +9728,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9705,40 +9742,40 @@ msgstr "OSM-gegevens downloaden" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9801,5 +9838,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9812,66 +9849,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Changeset sluiten" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Voorbereiden…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Uploaden..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9906,5 +9943,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9931,5 +9968,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9937,5 +9974,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9948,5 +9985,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10098,5 +10135,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10105,38 +10142,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10144,19 +10181,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Incomplete -specificatie met ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Ongeldig object met id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10166,10 +10203,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10179,25 +10214,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10663,5 +10698,5 @@ msgstr "(De tekst is reeds gekopieerd naar je klembord.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10670,12 +10705,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10685,5 +10713,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10693,10 +10721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10705,5 +10728,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10712,5 +10735,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10719,9 +10742,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10731,5 +10761,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10738,5 +10768,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10745,5 +10775,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10752,10 +10782,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10764,10 +10794,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10778,5 +10808,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10786,5 +10816,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11513,5 +11543,5 @@ msgstr "Bestand {0} gaat fout" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11524,29 +11554,48 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Laden bestand is mislukt" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Bufferbestand Lambert-zone 1 (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Bufferbestand Lambert-zone 1 (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Bufferbestand Lambert-zone 2 (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Bufferbestand Lambert-zone 3 (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Bufferbestand Lambert-zone 4 (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11575,13 +11624,13 @@ msgstr "Kies uit..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Kadaster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Automatisch vullen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11590,13 +11639,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11889,43 +11938,49 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambert-zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Locatie uit buffer laden (alleen als buffer ingeschakeld is)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Locatie veranderen" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Een nieuwe locatie voor het volgende verzoek instellen" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Een nieuwe laag toevoegen" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Locatie" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11935,5 +11990,5 @@ "die bekend is bij www.cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Voegt nieuwe laag toe" @@ -11964,5 +12019,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "WMS aanpassen" @@ -11992,5 +12047,5 @@ "Selecteer er eerst één en probeer dan opnieuw" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11998,28 +12053,28 @@ msgstr "Lege laag" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS-laag ({0}), {1} tegel(s) geladen" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Is niet gevectoriseerd." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Is gevectoriseerd." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Omvattende reschthoek gemeente: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12030,25 +12085,16 @@ "Maak een nieuwe aan." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Fout in bufferstructuur" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Fout in buffer Lambert-zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13098,20 +13144,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Wil je dit toestaan?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Remote-controlopdracht bevestigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13234,13 +13280,9 @@ msgstr "Zoom verkleinen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13826,6 +13868,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Ongeordende kustlijn" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14484,12 +14527,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Downloaden" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Kaart downloaden van de OSM-server." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14505,9 +14546,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Er zijn onopgeloste conflicten in laag ''{0}''.
U dient deze eerst " -"op te lossen" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14529,7 +14568,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Dubbele knopen verwijderen..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14595,29 +14633,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "De positie van de geselecteerde WMS-laag aanpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14626,5 +14664,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14632,10 +14670,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14651,24 +14689,24 @@ msgstr "Automatisch downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-laag ({0}), in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14679,13 +14717,13 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14693,44 +14731,49 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "WMS-laag in bestand opslaan" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "WMS-laag uit bestand laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Fout in bestandsindeling" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Bladwijzers" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27045,8 +27088,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "ongebruikelijke tagcombinatie" @@ -27066,34 +27108,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE-kaarten" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE-kaarten (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27103,9 +27134,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Straten NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27119,25 +27153,128 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Kan niet zoeken omdat er geen data geladen is" - -#~ msgid "help" -#~ msgstr "hulp" - -#~ msgid "Help / About" -#~ msgstr "Hulp / Over" - -#~ msgid "WMS Plugin Help" -#~ msgstr "WMS-pluginhulp" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE-kaarten" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE-kaarten (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Bufferbestand Lambert-zone 2 (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Bufferbestand Lambert-zone 3 (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Bufferbestand Lambert-zone 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Bufferbestand Lambert-zone 2 (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Bufferbestand Lambert-zone 3 (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Bufferbestand Lambert-zone 4 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Bufferbestand Lambert-zone 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Bufferbestand Lambert-zone 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Bufferbestand Lambert-zone 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Bufferbestand Lambert-zone 1 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Bufferbestand Lambert-zone 1 (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "BELANGRIJK: gegevens gepositioneerd ver\n" +#~ "van de huidige Lambert-zonelimieten.\n" +#~ "Upload geen gegevens na deze melding.\n" +#~ "Maak je laatste opdracht ongedaan, sla\n" +#~ "je werk op en start een nieuwe laag in de\n" +#~ "nieuwe zone." + +#~ msgid "Edit Properties" +#~ msgstr "Eigenschappen bewerken" #~ msgid "Select a bookmark first." @@ -27444,4 +27581,10 @@ #~ "wachtwoord." +#~ msgid "help" +#~ msgstr "hulp" + +#~ msgid "WMS Plugin Help" +#~ msgstr "WMS-pluginhulp" + #~ msgid "Navigation" #~ msgstr "Navigatie" @@ -27616,4 +27759,7 @@ #~ msgstr "De rij om te kopiëren selecteren." +#~ msgid "Help / About" +#~ msgstr "Hulp / Over" + #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" @@ -27676,9 +27822,4 @@ #~ msgstr "" #~ "Stel handmatig de Lambert-zone in (b.v. voor locaties tussen twee zones)" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}" #~ msgid "" @@ -27806,2 +27947,5 @@ #~ msgid "Upload to OSM API failed" #~ msgstr "Upload naar OSM API gefaald" + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Kan niet zoeken omdat er geen data geladen is" Index: applications/editors/josm/i18n/po/pl.po =================================================================== --- applications/editors/josm/i18n/po/pl.po (revision 18772) +++ applications/editors/josm/i18n/po/pl.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:31+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 18:05+0000\n" +"Last-Translator: Piotr Strębski \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -31,20 +31,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Pominięto niepoprawny URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -65,21 +65,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -87,6 +85,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -98,12 +96,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Uwaga" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Pominięto niepoprawny URL do pliku: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Nie można odczytać pliku ''{0}''.
Błąd:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -111,17 +118,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Nie można odczytać pliku ''{0}''.
Błąd:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -129,8 +127,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -140,21 +138,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -178,8 +176,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -192,6 +193,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Błąd" @@ -212,6 +213,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -306,5 +307,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -313,27 +314,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -351,5 +352,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Anuluj" @@ -359,19 +360,19 @@ msgstr "Proszę wybrać conajmniej jeden węzeł, drogę lub relację" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Proszę, wybierz warstwę docelową." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Wybierz warstwę docelową" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Połącz" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -382,5 +383,5 @@ "źródłową
''{0}''
." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Brak warstw docelowych." @@ -493,13 +494,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -597,20 +598,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Plik: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Nie ma otwartych changesetów" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Brak otwartych changesetów" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -650,10 +651,10 @@ "węzłów)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Połącz {0} dróg" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Wybierz co najmniej dwie drogi do połączenia." @@ -699,10 +700,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -721,11 +722,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Zastąp" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Plik istnieje. Nadpisać?" @@ -774,5 +775,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -781,6 +782,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -796,7 +797,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -824,5 +824,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Powiel" @@ -846,30 +846,30 @@ msgstr "Kończy pracę z programem." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Wszystkie formaty" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Eksportuj do GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Eksportuj dane do pliku GPX" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nie ma nic do wyeksportowania. Utwórz jakieś obiekty." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -877,13 +877,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -902,8 +902,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -911,7 +911,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -934,9 +934,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -948,5 +948,5 @@ msgstr "parameter ''{0}'' nie może być pusty (null)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -954,5 +954,5 @@ msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Eksportuj do pliku GPX" @@ -1098,6 +1098,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nowa" @@ -1229,5 +1229,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Wklej" @@ -1315,11 +1315,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Zapisz" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Zapisuje bieżące dane." @@ -1376,10 +1376,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Zapisz jako..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Zapisuje bieżące dane do nowego pliku." @@ -1396,10 +1396,10 @@ msgstr "Wstecz" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Pokazuje raport konfiguracji programu" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1407,20 +1407,20 @@ "do informacji o błędzie." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Pomoc: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Raport konfiguracji" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Skopiuj do schowka i zamknij" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1583,5 +1583,5 @@ msgstr "Rozdzielenie węzła" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1589,5 +1589,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1634,55 +1634,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Nie znaleziono aktualnego zestawu danych" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Nie znalazłem obiektu o id {0} w zestawie danych." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Aktualizuj zaznaczenie" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Aktualizuj zaznaczenie" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Nie wybrano elementów do odświerzenia." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Wybrano zbiór pusty." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Aktualizuj zaznaczenie" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Wysyłam dane" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1693,5 +1690,5 @@ "
Musisz je najpierw rozwiązać." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1699,29 +1696,29 @@ msgstr "Brak zmian do wysłania." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Synchronizuję tylko węzeł {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Synchronizuję tylko drogę {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Synchronizuję tylko relację {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synchronizuj cały zestaw danych" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1735,11 +1732,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Wykryto konflikty" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1750,5 +1747,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1758,22 +1755,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Zamknięto changeset" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "Kliknij aby przerwać i powrócić do edycji." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1784,19 +1781,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Odświeżam element" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1805,5 +1802,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1812,15 +1809,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1932,17 +1929,17 @@ msgstr "Zmniejsza prędkość odtwarzania." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Pobieranie danych GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Pobrane dane GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Pobieranie danych" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1950,5 +1947,5 @@ msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "Nie znaleziono żadnych danych w tym obszarze." @@ -2002,9 +1999,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Błędy podczas pobierania" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2022,5 +2019,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2028,5 +2025,5 @@ msgstr "Tryb: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2123,7 +2120,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Narysuj prostokąt pożądanych rozmiarów i zwolnij przycisk myszy." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2132,9 +2128,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Narysuj odcinek aby utworzyć prostokąt." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2146,5 +2141,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2164,17 +2159,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Więcej elementów" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Przesuń je" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Cofnij przesunięcie" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2187,13 +2182,13 @@ "Czy na pewno je przesunąć?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2202,9 +2197,9 @@ "najbliższym węzłem." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Zwolnij przycisk myszy aby zakończyć obracanie." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2212,15 +2207,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Powiększ" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Powiększanie i przesuwanie mapy." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2230,10 +2225,10 @@ "+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Szukaj..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2242,59 +2237,58 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Podaj proszę czego szukać." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "wyrażenie regularne" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "zamień zaznaczenie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "dodaj do zaznaczenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "usuń z zaznaczenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "uwzględnij wielkość liter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "wyrażenie regularne" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Baker Street - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' gdziekolwiek w nazwie" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2302,35 +2296,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - brak 'Bak' w nazwie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - klucz=foot ustawiony na dowolną wartość" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +msgid "Special targets:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" -msgstr "" +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - rodzaj obiektu (node, way, relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - rodzaj obiektu (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - wszystkie obiekty zmienione przez użytkownika" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - obiekt z podaną liczbą węzłów" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2338,43 +2332,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - wszystkie zmienione obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - wszystkie zaznaczone obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - wszystkie niekompletne obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - wszystkie obiekty bez tagów" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "Użyj I lub OR by połączyć logicznym \"lub\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Użyj \" aby wpisać operator (np.: jeżeli klucz zawiera :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Użyj ( oraz ) aby pogrupować wyrażenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2384,51 +2378,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Szukaj" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Rozpocznij szukanie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Nie znaleziono nic szukając ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Znaleziono {0} pasujących." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" @@ -2442,40 +2436,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Brak argumentów dla operator lub." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Brak argumentu dla operatora nie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Brak nawiasu zamykającego." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2484,9 +2478,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2495,5 +2489,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2593,7 +2587,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2704,5 +2698,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2727,5 +2721,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2733,6 +2727,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2802,17 +2796,7 @@ msgstr "Potwierdź usunięcie." -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2846,10 +2830,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2882,20 +2866,20 @@ msgstr "Sekwencja" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2917,10 +2901,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2964,5 +2948,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nowa wartość" @@ -3009,7 +2993,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Parametr \"{0}\" nie może być pusty (ang. null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3018,10 +3002,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Błąd w pliku konfiguracyjnym w linii {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3030,5 +3014,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3037,5 +3021,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3044,5 +3028,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3051,5 +3035,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3057,5 +3041,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3064,5 +3048,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3071,5 +3055,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3078,5 +3062,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3085,10 +3069,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3169,25 +3153,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "W" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3195,5 +3179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3201,5 +3185,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3209,26 +3193,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Brak argumentu dla operatora nie." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3237,5 +3221,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3298,24 +3282,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3323,5 +3307,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3349,10 +3333,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3363,7 +3347,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Parametr \"{0}\" nie może być pusty (ang. null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3517,10 +3501,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Błąd: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3532,6 +3516,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3542,5 +3526,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3551,6 +3535,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3569,6 +3553,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "tło" @@ -3586,19 +3570,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "odwzorowanie Lamberta (Estonia)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3612,26 +3613,51 @@ msgstr "odwzorowanie Merkatora" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3646,10 +3672,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Nie pokazuj ponownie" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3657,32 +3683,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "niekompletne" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "droga" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "tory kolejowe" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "szlak wodny" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "zagospodarowanie przestrzenne" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3692,5 +3718,5 @@ msgstr[2] "{0} węzłów" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3729,6 +3755,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Konflikt" @@ -3738,11 +3764,11 @@ msgstr "Nieznany adres" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3938,11 +3964,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4057,5 +4083,5 @@ msgstr "Długość nowego, tworzonego odcinka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4063,18 +4089,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(brak obiektu)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "warstwa nie jest na liście." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4195,67 +4221,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Etykiety" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Członkowie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4263,68 +4289,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4332,5 +4358,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4338,30 +4364,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4369,5 +4395,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4375,14 +4401,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4390,5 +4416,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4396,54 +4422,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Usuń" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4452,5 +4478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4459,5 +4485,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4466,5 +4492,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4473,5 +4499,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4480,6 +4506,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4488,6 +4514,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4498,5 +4524,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4508,5 +4534,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4515,19 +4541,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4536,9 +4562,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4548,5 +4574,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4570,84 +4596,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "usunięto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4657,17 +4683,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4676,9 +4702,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4693,19 +4719,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4721,10 +4747,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4734,10 +4760,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4764,27 +4790,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4809,22 +4835,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4832,5 +4858,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4921,6 +4947,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4932,5 +4958,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4945,21 +4971,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4967,5 +4993,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5052,10 +5078,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5075,17 +5101,17 @@ msgstr "Historia poleceń: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Rozwiąż" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5094,25 +5120,25 @@ msgstr "Zaznacz na mapie elementy zaznaczone na powyższej liście." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5124,13 +5150,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5142,8 +5168,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5210,5 +5236,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5240,34 +5266,34 @@ msgstr "Otwiera listę wszystkich wczytanych warstw." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Usuń zaznaczoną warstwę." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Pokaż/Ukryj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Zmienia widocznoś zaznaczonej warstwy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu." @@ -5277,19 +5303,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Ta operacja może zmienić {0} obiekt." -msgstr[1] "Ta operacja może zmienić {0} obiekty." -msgstr[2] "Ta operacja może zmienić {0} obiektów." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Ustawienie wartości na pustą usuwa klucz" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5298,10 +5322,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Zmienić wartości?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5311,5 +5335,5 @@ msgstr[2] "Zmiana właściwości {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5319,9 +5343,9 @@ msgstr[2] "Ta operacja może zmienić {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Proszę wybierz klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Proszę wybierz wartość" @@ -5345,102 +5369,98 @@ msgstr "Członek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Dodaj właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Właściwości: {0} / członkostwo: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Właściwości / członkostwo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Zmień relację" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Usuń z relacji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Na pewno usunąć zaznaczenie z relacji {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Usuń wybrany klucz ze wszystkich obiektów." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Usuń właściwość" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Edycja właściwości" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Właściwości: {0} / członkostwo: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Właściwości / członkostwo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Zmień relację" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Usuń z relacji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Na pewno usunąć zaznaczenie z relacji {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Usuń wybrany klucz ze wszystkich obiektów." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Usuń właściwość" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relacje" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Otwiera listę wszystkich relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relacje: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Otwiera okno edycji dla zaznaczonej relacji." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Usuwa zaznaczoną relację." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Utwórz nową relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5469,5 +5489,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5479,9 +5499,9 @@ msgstr "Zaznaczenie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Oderwij panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5489,5 +5509,5 @@ "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela" @@ -5568,12 +5588,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5591,5 +5611,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5597,5 +5617,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5603,18 +5623,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5623,14 +5643,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5640,9 +5660,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5652,15 +5672,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5668,5 +5688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5674,20 +5694,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5696,66 +5716,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Przesuń aktualnie zaznaczonych członkół w górę" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5764,9 +5784,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5775,41 +5795,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Pobierz członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5819,19 +5839,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Zmień relację {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5852,10 +5879,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5869,5 +5892,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5937,9 +5960,9 @@ msgstr "Zakładki" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5948,52 +5971,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min szer." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min dł." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max szer." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max dł." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6002,52 +6025,52 @@ "Adres URL z www.openstreetmap.org (można wkleić adres aby pobrać obszar)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Wybrany obszar" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Źródła i rodzaje danych" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "dane OpenSteetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "czyste dane GPS" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Pobierz jako nową warstwę" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6055,40 +6078,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Pobierany obszar" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Pobierz" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" "Pobierany obszar jest za duży, prawdopodobnie zostanie odrzucony przez serwer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" "Pobierany obszar jest OK, prawdopodobnie zostanie zaakceptowany przez serwer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6110,21 +6133,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6863,8 +6886,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7037,5 +7060,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7047,5 +7070,5 @@ msgstr "Rodzaj" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7092,5 +7115,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7104,5 +7127,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7113,5 +7136,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7120,19 +7143,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7142,32 +7165,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7189,5 +7212,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7249,7 +7272,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parameter ''{0}'' nie może być pusty (null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7279,33 +7302,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Pokaż problem" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "tablica historyczna" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7314,7 +7335,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Sortuj menu szablonów" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7332,7 +7352,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7372,7 +7391,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonimowy" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7400,12 +7418,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Wersja {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "usunięto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7463,10 +7480,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7677,5 +7694,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7698,17 +7715,17 @@ msgstr "Warstwa" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7724,7 +7741,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7767,29 +7784,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Wyślij zmiany" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7797,38 +7814,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7836,16 +7853,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7889,24 +7906,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Obrazy dla {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Wczytaj GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Brak znacznika czasowego dla punktu {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7914,33 +7931,33 @@ msgstr "Wczytywanie {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geolokalizowane obrazy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS początek: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS koniec: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "aktualne przesunięcie: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "różnica stref czasowych: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7950,14 +7967,14 @@ msgstr[2] "obrazów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} wewnątrz ścieżki GPS." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Synchronizuj zegar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7965,32 +7982,32 @@ msgstr "Pliki JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Obraz" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synchronizuj czas z urządzeniem GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Podany czas nie został rozpoznany." @@ -8080,5 +8097,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8132,10 +8149,10 @@ msgstr[2] "{0} punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Przekształć w warstwę danych" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8145,11 +8162,11 @@ "za niebezpieczne.
Jeśli chcesz wysłać same ślady zajrzyj tu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8159,29 +8176,29 @@ msgstr "Przekonwertowany z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Pobierz dane OSM wzdłuż tej ścieżki" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Pobierz wszystko pomiędzy:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metrów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Maksymalny obszar na zapytanie:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km kw." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8192,5 +8209,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -8198,5 +8215,5 @@ "danymi dźwiękowymi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8204,5 +8221,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8210,23 +8227,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Warstwa danych {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "poza pobranym obszarem" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8235,5 +8252,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8247,5 +8264,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8258,11 +8275,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8271,21 +8288,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "Obiekty na warstwie {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" msgstr "" @@ -8387,9 +8416,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Pokaż/Ukryj Tekst/Ikony" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Zmienia widoczność markerów tekstowych i ikon." @@ -8453,5 +8482,5 @@ "użyte)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8459,5 +8488,5 @@ msgstr "Proszę wybrać wiersz do edycji" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8465,5 +8494,5 @@ msgstr "Nowa wartość dla {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8472,5 +8501,5 @@ msgstr "Proszę wybrać wiersz do usunięcia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Podaj nowy klucz i jego wartość" @@ -8593,40 +8622,40 @@ msgstr "Kalibracja urządzenia nagrywającego" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Kolor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Styl rysowania {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Warstwa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Wybierz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Wybierz kolor dla {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Ustaw na domyślne" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Domyślne ustawienie dla wszystkich" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Kolory wykorzystywane przez różne obiekty w JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Kolory" @@ -9067,17 +9096,17 @@ "aktywne." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Wyświetlaj współrzędne jako" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Rodzaj odwzorowania kartograficznego" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9087,5 +9116,5 @@ msgstr "Odwzorowanie kartograficzne" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9143,81 +9172,81 @@ msgstr "Skrót" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9226,6 +9255,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9391,10 +9420,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9404,13 +9433,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9418,18 +9447,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Dodatkowe atrybuty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "zamknięta droga" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Nieznany typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9440,15 +9469,15 @@ msgstr "Nie można odczytać źródła szablonów: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Błąd podczas przetwarzania {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu {0} nie są wspierane." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9459,18 +9488,18 @@ msgstr[2] "Zmień {0} obiektów" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Nieodpowiednie zaznaczenie." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Zastosuj szablon" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Zmień właściwości" @@ -9486,6 +9515,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9494,8 +9523,21 @@ msgstr "Łączenie z serwerem OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Pobieranie punktów od {0} do {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9613,11 +9655,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9627,40 +9669,40 @@ msgstr "Pobieranie danych OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9723,5 +9765,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9734,66 +9776,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Zamykanie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Przygotowywanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Wysyłanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9828,5 +9870,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9853,5 +9895,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9859,5 +9901,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9870,5 +9912,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10019,5 +10061,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10026,38 +10068,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10065,19 +10107,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Niekompletny opis z ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Niedozwolony obiekt z id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10087,10 +10129,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10100,25 +10140,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10586,5 +10626,5 @@ msgstr "(Tekst już został skopiowany do schowka.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10593,12 +10633,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10608,5 +10641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10616,10 +10649,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10628,5 +10656,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10635,5 +10663,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10642,9 +10670,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10654,5 +10689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10661,5 +10696,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10668,5 +10703,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10675,10 +10710,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10687,10 +10722,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10701,5 +10736,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10709,5 +10744,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11428,5 +11463,5 @@ msgstr "Błąd w pliku {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11439,28 +11474,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Błąd podczas ładowania pliku" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11490,13 +11542,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11505,13 +11557,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11791,43 +11843,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11835,5 +11892,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11865,5 +11922,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11891,5 +11948,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11897,28 +11954,28 @@ msgstr "Pusta warstwa" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11927,24 +11984,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12142,9 +12190,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 msgid "Refresh" -msgstr "Odświerz" +msgstr "Odśwież" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100 msgid "refresh the port list" -msgstr "" +msgstr "odśwież listę portów" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108 @@ -12976,20 +13024,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13111,13 +13159,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13689,6 +13733,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Niepołączone drogi." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14330,12 +14375,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Pobierz" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Pobiera dane mapy z serwera OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14351,9 +14394,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Nie ma warstw, z którymi można by połączyć warstwę " -"źródłową
''{0}''
." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14375,7 +14416,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Powielone węzły drogi" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14441,29 +14481,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14472,5 +14512,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14478,10 +14518,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14496,24 +14536,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14524,57 +14564,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Zmiana rozdzielczości" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Błędny format pliku" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Zakładki" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26886,8 +26931,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26907,34 +26951,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "Mapy NPE" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Maps (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -26944,9 +26977,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Ulice NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26960,16 +26996,166 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Nie mogę szukać ponieważ nie załadowano danych." +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "Mapy NPE" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Edit Properties" +#~ msgstr "Edycja właściwości" + +#~ msgid "Move" +#~ msgstr "Przenieś" + +#~ msgid "File could not be found." +#~ msgstr "Plik nie został odnaleziony." + +#~ msgid "No document open so nothing to save." +#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." + +#~ msgid "Unknown file extension." +#~ msgstr "Nieznane rozszerzenie pliku." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Unsaved Changes" +#~ msgstr "Niezapisane zmiany" + +#~ msgid "Object" +#~ msgstr "Obiekt" + +#~ msgid "Unknown version" +#~ msgstr "Nieznana wersja" + +#~ msgid "true" +#~ msgstr "prawda" + +#~ msgid "false" +#~ msgstr "fałsz" + +#~ msgid "unnamed" +#~ msgstr "bez nazwy" + +#~ msgid "Data Layer" +#~ msgstr "Warstwa danych" + +#~ msgid "Error while parsing" +#~ msgstr "Błąd podczas przetwarzania" + +#~ msgid "name" +#~ msgstr "nazwa" + +#~ msgid "my version:" +#~ msgstr "moja wersja:" + +#~ msgid "their version:" +#~ msgstr "ich wersja:" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nie można połączyć się z serwerem." + +#~ msgid "Date" +#~ msgstr "Data" + +#~ msgid "Revert" +#~ msgstr "Wycofaj" + +#~ msgid "OSM username (email)" +#~ msgstr "Użytkownik OSM (email)" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "Używa szablon \"{0}\"" + +#~ msgid "position" +#~ msgstr "pozycja" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Usuń {1} {0}" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?" + +#~ msgid "zoom" +#~ msgstr "powiększenie" + +#~ msgid "Validate" +#~ msgstr "Zweryfikuj" + +#~ msgid "Station" +#~ msgstr "stacja" + +#~ msgid "Edit Station" +#~ msgstr "Edycja stacji" + +#~ msgid "Charge" +#~ msgstr "Opłata" #~ msgid "help" @@ -26981,97 +27167,4 @@ #~ msgid "WMS Plugin Help" #~ msgstr "Pomoc wtyczki WMS" - -#~ msgid "Move" -#~ msgstr "Przenieś" - -#~ msgid "File could not be found." -#~ msgstr "Plik nie został odnaleziony." - -#~ msgid "No document open so nothing to save." -#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." - -#~ msgid "Unknown file extension." -#~ msgstr "Nieznane rozszerzenie pliku." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Unsaved Changes" -#~ msgstr "Niezapisane zmiany" - -#~ msgid "Object" -#~ msgstr "Obiekt" - -#~ msgid "Unknown version" -#~ msgstr "Nieznana wersja" - -#~ msgid "true" -#~ msgstr "prawda" - -#~ msgid "false" -#~ msgstr "fałsz" - -#~ msgid "unnamed" -#~ msgstr "bez nazwy" - -#~ msgid "Data Layer" -#~ msgstr "Warstwa danych" - -#~ msgid "Error while parsing" -#~ msgstr "Błąd podczas przetwarzania" - -#~ msgid "name" -#~ msgstr "nazwa" - -#~ msgid "my version:" -#~ msgstr "moja wersja:" - -#~ msgid "their version:" -#~ msgstr "ich wersja:" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nie można połączyć się z serwerem." - -#~ msgid "Date" -#~ msgstr "Data" - -#~ msgid "Revert" -#~ msgstr "Wycofaj" - -#~ msgid "OSM username (email)" -#~ msgstr "Użytkownik OSM (email)" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "Używa szablon \"{0}\"" - -#~ msgid "position" -#~ msgstr "pozycja" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Usuń {1} {0}" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?" - -#~ msgid "zoom" -#~ msgstr "powiększenie" - -#~ msgid "Validate" -#~ msgstr "Zweryfikuj" - -#~ msgid "Station" -#~ msgstr "stacja" - -#~ msgid "Edit Station" -#~ msgstr "Edycja stacji" - -#~ msgid "Charge" -#~ msgstr "Opłata" #~ msgid "No data imported." @@ -27458,4 +27551,7 @@ #~ msgstr "Nieznay typ (tczy lyterki na koncu) pliku ''{0}''" +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Nie mogę szukać ponieważ nie załadowano danych." + #~ msgid "" #~ "There are unsaved changes in {0} layer. Discard the changes and continue?" Index: applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- applications/editors/josm/i18n/po/pt_BR.po (revision 18772) +++ applications/editors/josm/i18n/po/pt_BR.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:28+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 17:52+0000\n" "Last-Translator: billymenzl \n" "Language-Team: Brazilian Portuguese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:05+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Ajuda" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL malformada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando arquivo malformado: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Não pode ler o ficheiro ''{0}''.
Erro:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Não pode ler o ficheiro ''{0}''.
Erro:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Erro" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -308,5 +309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -315,27 +316,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -353,5 +354,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Cancelar" @@ -361,19 +362,19 @@ msgstr "Por favor, selecione pelo menos um nó, caminho ou relação." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Por favor a camada destino" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Selecione camada destino" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Combinar" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -384,5 +385,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Sem camadas destino" @@ -495,13 +496,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -599,20 +600,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Arquivo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -652,10 +653,10 @@ "único conjunto de nós)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} caminhos" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Por favor selecione no mínimo 2 caminhos a combinar" @@ -701,10 +702,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -723,11 +724,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Sobrescrever" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "O arquivo já existe. Sobrescrever?" @@ -775,5 +776,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -782,6 +783,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -797,7 +798,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -825,5 +825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplicar" @@ -847,30 +847,30 @@ msgstr "Sair do aplicativo." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Todos os formatos" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportar para GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportar dados para arquivo GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nada a exportar. Escolha alguns dados antes." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -878,13 +878,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -903,8 +903,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -912,7 +912,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -935,9 +935,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -949,5 +949,5 @@ msgstr "parâmetro ''{0}'' não pode ser nulo" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -955,5 +955,5 @@ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exportar arquivo GPX" @@ -1100,6 +1100,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Novo" @@ -1231,5 +1231,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Colar" @@ -1319,11 +1319,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Salvar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Salvar dados atuais" @@ -1380,10 +1380,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Salvar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Salvar os dados atuais para um novo arquivo." @@ -1402,30 +1402,30 @@ "objetos incompletos também." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Mostrar relatório atual" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" "Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Ajuda: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Relatório Atual" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Copiar para área de transferência e fechar" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1595,5 +1595,5 @@ msgstr "Nó não grudado" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1601,5 +1601,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1646,55 +1646,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Atualizar Seleção" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Atualizar Seleção" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Não há primitivas selecionadas para atualizar." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Seleção vazia" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Atualizar Seleção" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Enviar dados" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1703,5 +1700,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1709,29 +1706,29 @@ msgstr "Não há modificações a enviar." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Não há nada a enviar. Baixe dados primeiro." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synchronizar todo o conjunto de dados" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1752,11 +1749,11 @@ " para abortar e continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1771,5 +1768,5 @@ "
Clique {1} para abortar e continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1779,22 +1776,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1805,19 +1802,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Atualizando primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1826,5 +1823,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1833,15 +1830,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1953,17 +1950,17 @@ msgstr "Avanço Lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Baixando dados do GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Dados GPX baixados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Baixando dados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1973,5 +1970,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -2031,9 +2028,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Erros ao Transferir" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2051,5 +2048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2057,5 +2054,5 @@ msgstr "Modo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2152,8 +2149,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." msgstr "" -"Marque um retângulo no tamanho desejado, depois solte o botão do mouse." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2163,9 +2158,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Arraste um segmento de caminho para fazer um retângulo" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2179,5 +2173,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2197,17 +2191,17 @@ msgstr[1] "Adicionar e mover um novo nó virtual a {0} caminhos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Mover elementos" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Mova-os" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Desfazer mover" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2220,13 +2214,13 @@ "Quer realmente move-los?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Mover sempre e não mostrar dica outraves" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Solte o botão do mouse para selecionar os objetos no retângulo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2235,9 +2229,9 @@ "próximo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Solte o botão do mouse para parar de girar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2247,15 +2241,15 @@ "alternar); Shift-Ctrl para rotacionar seleção; ou altere seleção" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Ampliar" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Ampliar e mover mapa" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2265,10 +2259,10 @@ "Abaixo, Direita; mova ampliação com o botão direito" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Pesquisar..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2277,58 +2271,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Por favor, entre com uma string de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "expressão regular" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "susbtitui a seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "adiciona à seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "remove da seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "sensível à caixa alta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "expressão regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Rua Augusta - 'Rua' and 'Augusta em qualquer chave ou valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' em qualquer chave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:May - 'Bak' em qualquer parte do nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - chave 'type' com valor exato 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2338,35 +2331,35 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - 'Bak' não existe no nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - qualquer valor presente na chave=foot" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Destinos especiais:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - tipo de objeto (nó, caminho, relação)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - tipo de objeto (nó, caminho, relação)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - todos os objetos modificados por determinado usuário" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nós:... - objeto com um determinado número de nós" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2374,27 +2367,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modificado - todos os objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selecionados - todos os objetos selecionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incompletos - todos os objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "não tagueados - todos objetos não tagueados" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expr - todos objetos filhos que coincidem com a expressão" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expr - todos objetos filhos que coincidem com a expressão" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "" "parent expr - all parents of objects matching the expression" @@ -2403,17 +2396,17 @@ "expressão" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "Use | ou OR para combinar com \"ou\" lógico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Usar \" para operadores de aspas (se a chave contém :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Usar ( and ) para agrupar expressões" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2423,51 +2416,51 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Iniciar Pesquisa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Não há valores coincidentes para ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nada adicionado à seleção pela busca por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nada foi removido da seleção quando buscado por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Encontrados {0} resultados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2485,5 +2478,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2491,10 +2484,10 @@ "chave=valor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2503,26 +2496,26 @@ "ou relação." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Credencial de autenticação inesperada: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Faltam argumentos para \"or\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Falta argumento para \"not\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Fechamento de parenteses esperado." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2531,9 +2524,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parametros incorreto para operador de nós." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2544,5 +2537,5 @@ "de nós ou um intervalo, por exemplos, os nós:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2647,7 +2640,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2759,5 +2752,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Conflito duplo" @@ -2782,5 +2775,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2788,6 +2781,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "não foi possível resolver conflito não-definido" @@ -2857,18 +2850,8 @@ msgstr "Apagar confirmação" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Resolver conflitos em estado de exclusão em {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2903,10 +2886,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolver conflitos na lista de membros da relação {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2941,20 +2924,20 @@ msgstr "Sequência" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Resolver {0} conflitos do rotulo no nó {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Resolver {0} conflitos do rotulo no caminho {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Resolver {0} conflitos do rotulo na relação {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2976,10 +2959,10 @@ msgstr "Resolver os conflictos da versão na relação {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3023,5 +3006,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Novo valor" @@ -3068,7 +3051,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "parametro {0} > 0 necessário. Obtido {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3077,10 +3060,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Erro no arquivo de configuração nas linhas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3091,5 +3074,5 @@ "\"{0}\" não é uma directória." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3100,5 +3083,5 @@ "preferência \"{0}\" não é uma directória." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3109,5 +3092,5 @@ "falta da directória da preferência: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3118,5 +3101,5 @@ "devido a falta da directória da preferência: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3126,5 +3109,5 @@ "preferências base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3135,5 +3118,5 @@ "ficheiro de preferência base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3144,5 +3127,5 @@ "de preferências base: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3154,5 +3137,5 @@ "preferências base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3163,10 +3146,10 @@ "preferências para original: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3247,25 +3230,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "O" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "L" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3273,5 +3256,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3279,5 +3262,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3287,26 +3270,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Falta argumento para \"not\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3315,6 +3298,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3322,7 +3305,4 @@ "Keeping target object. " msgstr "" -"Minha primitiva com id {0} e versão {1} é visível, mas sua primitiva com " -"versão menor {2} não é visível. Não é possível tratar esta inconsistência. " -"Mantendo minha primitiva. " #. translators notes must be in front @@ -3379,24 +3359,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3404,5 +3384,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3430,10 +3410,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3444,7 +3424,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "parametro {0} > 0 necessário. Obtido {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3463,9 +3443,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." msgstr "" -"não é possível comparar um primitivo com id ''{0}'' com um primitivo com id " -"''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3600,10 +3578,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3615,6 +3593,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3624,5 +3602,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3632,6 +3610,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3649,6 +3627,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "segundo plano" @@ -3666,24 +3644,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"IMPORTANTE: dados posicionados após\n" -"os limites de zona Lambert.\n" -"Não transfira nenhum dado após esta mensagem.\n" -"Desfaça sua última ação, salve seu trabalho\n" -"e comece uma nova camada na nova zona." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Zona Lambert" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3697,28 +3687,57 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zona" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Grade Suiça" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 #, java-format @@ -3731,10 +3750,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Não mostrar novamente" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3742,32 +3761,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "rodovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "ferrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "água" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "uso da terra" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3776,5 +3795,5 @@ msgstr[1] "{0} nós" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3812,6 +3831,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflito" @@ -3821,11 +3840,11 @@ msgstr "Servidor desconhecido" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4030,11 +4049,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4149,5 +4168,5 @@ msgstr "O comprimento do novo caminho que está sendo desenhado." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4155,18 +4174,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(nenhum objeto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Usuário:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "camada não está na lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4289,50 +4308,50 @@ msgstr "regra {0} não participa no par de comparação {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Nós" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Nenhum conflito de tags pendentes a ser resolvido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Etiquetas({0} conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} conflitos de tagueamento à serem resolvidos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Nós (resolvido)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4341,17 +4360,17 @@ "lista de nós desta via." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Nós (com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Conflitos pendentes na lista de nós desta via" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Membros(resolvido)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4361,68 +4380,68 @@ "na lista de membros desta relação" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Membros(com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitos pendentes na lista de membros desta relação" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Nenhum conflito de propriedades pendente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Propriedades(com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Conflito de propriedades pendente de solução" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Resolução de Conflito" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "parâmetro atual fora do intervalo: obtido {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "lista em regra {0} não está participando de um par comparado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "valor inesperado do parâmetro \"index\": {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "item {0} não encontrado na lista" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "bloquear scrolling" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Comparar " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Minha versão" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Lista dos elementos dos meu dados, ou seja, dados locais" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4430,5 +4449,5 @@ msgstr "Versão mesclada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4438,27 +4457,27 @@ "as decisões de mesclagem forem aplicadas." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Sua versão" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" "Lista de elementos de seu conjunto de dados, ou seja, o servidor de dados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr ">topo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Copiar meus nós selecionados para o início da lista de nós combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr ">botão" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" @@ -4466,5 +4485,5 @@ "combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4474,5 +4493,5 @@ "lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4482,5 +4501,5 @@ "na lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4489,5 +4508,5 @@ "combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" @@ -4495,5 +4514,5 @@ "combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4503,5 +4522,5 @@ "selecionado na lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4511,54 +4530,54 @@ "selecionado na lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Acima" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Move uma posição acima os elementos selecionados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Abaixo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Mover para baixo as entradas selecionadas em uma posição" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Remover" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Remover as entradas selecionadas da lista de elementos combinados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Congelar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Congelar a lista atual de elementos mesclados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Descongelar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Descongelar a lista de elementos mesclados e iniciar mesclagem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4569,5 +4588,5 @@ "e as deles" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4578,5 +4597,5 @@ "entradas e as deles" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4585,5 +4604,5 @@ msgstr[1] "Minha versão ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4592,5 +4611,5 @@ msgstr[1] "Versão combinada ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4599,6 +4618,6 @@ msgstr[1] "Sua versão ({0} entradas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4607,6 +4626,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4617,5 +4636,5 @@ msgstr "Nó" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4629,5 +4648,5 @@ msgstr "indice inesperado na coluna. Obtido {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4638,19 +4657,19 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "A comunicação com o servidor falhou" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Sim, repô-los também" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Não, cancelar operação" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4662,9 +4681,9 @@ "também?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Desfazer a remoção dos nós adicionais?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4676,5 +4695,5 @@ "estão apagado no servidor.

Deseja recuperá-los também?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Recuperar primitivas dependentes?" @@ -4700,84 +4719,84 @@ msgstr "Coordenadas:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Estado excluído:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Estado Visível:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(nenhum)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "removido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "não apagado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "visível (no servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "não visível (no servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Mantenha uma cópia da versão local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Eliminar fisicamente os dados locais" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Manter minhas coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Mantenha suas coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Não decidir conflito entre diferentes coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Manter meu estado de apagado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Manter seu estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Manter meu estado visível" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Sim, resetar id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Não, abortar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4787,17 +4806,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Resetar id para 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Manter seu estado visível" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Sim, limpe-o" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4808,9 +4827,9 @@ "
Concorda? " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Remover do conjuto de dados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4827,19 +4846,19 @@ "resolução" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4855,10 +4874,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4868,10 +4887,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4898,27 +4917,27 @@ msgstr "Sua versão (dados do servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Manter o par chave/valor selecionado dos dados locais" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Manter o par chave/valor selecionado dos dados do servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Pendente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Marcar as tags selecionadas como indeciso" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4943,22 +4962,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4966,5 +4985,5 @@ msgstr "nenhum" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5055,6 +5074,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5065,5 +5084,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5077,21 +5096,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -5099,5 +5118,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Regra:" @@ -5184,10 +5203,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5207,17 +5226,17 @@ msgstr "Pilha de comandos: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "Abrir uma janela de união dos itens selecionados na lista acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5228,25 +5247,25 @@ "acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancelar a resolução de conflitos e fechar a janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplicar a resolução de conflitos e fechar a janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Aplicar a resolução" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Fechar assim mesmo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Continuar resolvendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5258,13 +5277,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Conflito não resolvido completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Resolver conflitos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5276,8 +5295,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5344,5 +5363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5374,34 +5393,34 @@ msgstr "Abrir uma lista com camadas carregadas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Excluir camada selecionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Mostrar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Mudar estado de visibilidade do layer selecionado." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Ativar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Ativar camada selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Combinar esta camada em outra camada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Mover a camada selecionada uma linha acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Mover camada selecionada uma linha abaixo." @@ -5411,18 +5430,17 @@ msgstr "Informação sobre camada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Isto modificará {0} objeto." -msgstr[1] "Isto modificará {0} objetos." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Um valor vazio apaga a chave." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5431,10 +5449,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5443,5 +5461,5 @@ msgstr[1] "Modificar propriedades de até {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5450,9 +5468,9 @@ msgstr[1] "Isto modificará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Por favor, selecione uma chave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Por favor, selecione um valor" @@ -5476,102 +5494,98 @@ msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Adicionar Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Propriedades: {0} / Membros: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Propriedades / Associações" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Modificar relação" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Deletar da relação" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Confirmar a exclusão da relação {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Excluir a chave selecionada em todos objetos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Excluir Propriedades" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Adicionar um novo par chave/valor para todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Editar Propriedades" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da chave selecionada para todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Propriedades: {0} / Membros: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Propriedades / Associações" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Modificar relação" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Deletar da relação" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Confirmar a exclusão da relação {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Excluir a chave selecionada em todos objetos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Excluir Propriedades" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Abrir uma lista de de todas as relações." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relações: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Abrir um editor para a relação selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Excluir a relação selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Criar uma nova relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5600,5 +5614,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5610,9 +5624,9 @@ msgstr "Seleção: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Desacoplar painel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5620,5 +5634,5 @@ "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Clique para minimizar/maximizar o conteúdo do painel" @@ -5699,12 +5713,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Baixar membros do relaçoe" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Conflitos nos dados" @@ -5722,5 +5736,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5728,5 +5742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5734,18 +5748,18 @@ msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Tags e Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Relações de parentesco" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5754,14 +5768,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Apagá-los, limpar relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Ignorá-los, deixar relação como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5771,9 +5785,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Múltiplos membros referenciando a mesma primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5783,5 +5797,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5790,5 +5804,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5797,5 +5811,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5805,5 +5819,5 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5813,20 +5827,20 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Editor de Relações: Remover Selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5835,66 +5849,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Classificar a relação de membros" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Editor de Relações: Classificar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Mover os membros selecionados para cima" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Editor de Relações: Mover para cima" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Mover membros selecionados para baixo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Editor de Relações: Mover para Baixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Editor de Relações: Remover" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5903,9 +5917,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5914,41 +5928,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Aplicar atualizações e fechar aviso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Cancelar atualizações e fechar janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Adicionar uma tag vazia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Baixar todas vias imcompletas e nós desta relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Baixar membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Editor de Relações: Baixar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Definir uma papel para membros selecionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Aplicar papel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5958,19 +5972,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "Editar relação referente à relação selecionada atualmente" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Baixando relação {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5980,7 +6001,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "Editar relação referente à relação selecionada atualmente" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -5992,11 +6012,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Faz referência a" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Vinculado" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6009,5 +6025,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6077,9 +6093,9 @@ msgstr "Favoritos" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6088,52 +6104,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "lat mín" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "lon mín" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "lat máx" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "lon máx" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6143,52 +6159,52 @@ "área)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Retângulo Limite" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Fontes e tipos de dados" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Dados OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Dados GPS brutos" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Baixar como nova camada" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6196,18 +6212,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Baixar Área" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Baixar" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -6215,21 +6231,21 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Área para baixar ok, possívelmente será aceito pelo servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6251,21 +6267,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer exception, provavelmente faltam algumas tags." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -7004,8 +7020,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7178,5 +7194,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7188,5 +7204,5 @@ msgstr "Tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7233,5 +7249,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7245,5 +7261,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7254,5 +7270,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7261,19 +7277,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7283,32 +7299,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7330,5 +7346,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7395,12 +7411,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parametro {0} > 0 necessário. Obtido {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "parametro {0} > 0 necessário. Obtido {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7425,33 +7441,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Nó {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zoom para" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Carregar histórico" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Caminho {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7460,7 +7474,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "não apagado" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7478,7 +7491,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7506,10 +7518,8 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" -"Clique {0} para começar a combinar as minhas entradas " -"e as deles" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7520,7 +7530,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anônimo" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7548,17 +7557,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versão {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "removido" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Verção {0} creado do {2} no {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7611,10 +7619,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7825,5 +7833,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7846,17 +7854,17 @@ msgstr "Layer" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Nome do arquivo" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7872,7 +7880,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7915,29 +7923,29 @@ msgstr[1] "{0} objectos a apagar:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Enviar Modificações" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7947,38 +7955,38 @@ "usar uma chamada por primitiva" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Faça um comentário breve sobre as mudanças que está enviando:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7986,16 +7994,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8039,24 +8047,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Imagens para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Ler GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Sem tempo para ponto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8064,33 +8072,33 @@ msgstr "Lendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Não foram encontradas imagens com dados de tempo legíveis" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Imagens Geotagueadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Iniciar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Finalizar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "delta atual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "diferença de zona horária: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8099,14 +8107,14 @@ msgstr[1] "imagens" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} dentro da faixa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Sincronizar relógio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8114,32 +8122,32 @@ msgstr "Imagens JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "A data no arquivo \"{0}\" não pode ser analisada." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Imagem" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horária do GPS (diferença com foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar Tempo com Unidade GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "O tempo informado não pode ser analisado." @@ -8229,5 +8237,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8279,10 +8287,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Converter para camada de dados" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8292,11 +8300,11 @@ "arriscado.
Se quiser enviar dados, consulte aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces (EN)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8306,29 +8314,29 @@ msgstr "Convertido de: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Descarregar do OSM ao largo desta via" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Descargar tudo entre:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Área máxima por pedio:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8339,9 +8347,9 @@ "Você deseja
continuar? " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Não há trilha GPX disponível na camada para associar áudio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8349,5 +8357,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8355,23 +8363,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Camada de dados {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "fora da área baixada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "versão {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8380,5 +8388,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8392,5 +8400,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8403,11 +8411,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8416,22 +8424,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} consiste em:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "remover definição" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Versão API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Converter para camada GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Nenhum caminho \"de\" encontrado." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8528,9 +8549,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Mostrar/Esconder Texto/Ícones" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Alternar visibilidade do marcador de texto e ícones." @@ -8593,5 +8614,5 @@ "Valor padrão atual é desconhecido (preferências não foram usadas ainda)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8599,5 +8620,5 @@ msgstr "Por favor, selecione a linha para editar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8605,5 +8626,5 @@ msgstr "Novo valor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8612,5 +8633,5 @@ msgstr "Por favor, selecione a linha para apagar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Digite um novo par chave/valor" @@ -8744,40 +8765,40 @@ msgstr "Calibração do gravador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Cor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Camada: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Escolher" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Escolha uma cor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Definir para padrão" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Definir todos para padrão" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Cores utilizadas por diferentes objetos no JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Cores" @@ -9210,17 +9231,17 @@ msgstr "Você precicar reiniciar JOSM para aplicar mudanças." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Mostra coordinados como" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Método de Projeção" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9230,5 +9251,5 @@ msgstr "Projeção do Mapa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9286,81 +9307,81 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 -#, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Webpage: {0}" msgstr "Pagina: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Versão: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9369,6 +9390,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9534,10 +9555,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9547,13 +9568,13 @@ msgstr[1] "Remover chaves antigas de até {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9561,18 +9582,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Atributos opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "via sem saída" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconhecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9583,15 +9604,15 @@ msgstr "Não foi possível ler a fonte de preferência de tags: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Erro analisando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementos do tipo {0} são suportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9601,18 +9622,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nada selecionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Seleção inadequada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Aplicar Preferência" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Alterar propriedades" @@ -9628,6 +9649,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9636,8 +9657,21 @@ msgstr "Contatando servidor OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Baixando pontos {0} a {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9754,11 +9788,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9768,40 +9802,40 @@ msgstr "Baixando dados OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9864,5 +9898,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9875,66 +9909,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Fechando conjunto de mudanças..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Enviando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9969,5 +10003,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9994,5 +10028,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10000,5 +10034,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10011,5 +10045,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10160,5 +10194,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10167,38 +10201,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10206,19 +10240,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Especificação de incompleta com ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Objeto ilegal com id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10228,10 +10262,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10241,25 +10273,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10723,5 +10755,5 @@ msgstr "(O texto já foi copiado para a Área de Transferência)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10730,12 +10762,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10745,5 +10770,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10755,10 +10780,5 @@ "dados atual viola uma pré-condição.
A mensagem de erro é:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10767,5 +10787,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10774,5 +10794,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10781,9 +10801,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10793,5 +10820,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10800,5 +10827,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10807,5 +10834,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10814,10 +10841,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10826,10 +10853,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10840,5 +10867,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10848,5 +10875,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11564,5 +11591,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11575,29 +11602,48 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Erro ao carregar arquivo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" +msgstr "UTM20N Martinique Fort Desaix 1952" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11626,13 +11672,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11641,13 +11687,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11929,43 +11975,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zona" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Zona Lambert" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Adicionar uma nova camada" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Localidade" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11973,5 +12024,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -12002,5 +12053,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -12028,5 +12079,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12034,28 +12085,28 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12064,24 +12115,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -13107,20 +13149,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13242,13 +13284,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "imagen " @@ -13818,6 +13856,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "costa" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14458,12 +14497,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Baixar" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Baixar mapa do servidor OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14479,9 +14516,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Não há camadas em que a camada
''{0}''
possa ser combinada." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14503,7 +14538,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Unir {0} nós" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14569,29 +14603,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14600,5 +14634,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14606,10 +14640,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14622,24 +14656,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14650,57 +14684,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Favoritos" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27010,8 +27049,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "Combinação de tags não ususal" @@ -27031,34 +27069,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "Mapas NPE" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "Mapas NPE (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "" @@ -27068,9 +27095,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27084,36 +27114,89 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Não pode procurar porque não exite informação carregada." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Não há primitiva com versão {0} neste histórico" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "Não há versão válida na data ''{0}'' neste histórico" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "não foi encontrada versão anterior. Histórico está vazio." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "não foi encontrada a última versão. Histórico está vazio." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset." - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "Mapas NPE" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "Mapas NPE (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." #~ msgstr "" -#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto " -#~ "de dados" +#~ "IMPORTANTE: dados posicionados após\n" +#~ "os limites de zona Lambert.\n" +#~ "Não transfira nenhum dado após esta mensagem.\n" +#~ "Desfaça sua última ação, salve seu trabalho\n" +#~ "e comece uma nova camada na nova zona." + +#~ msgid "Edit Properties" +#~ msgstr "Editar Propriedades" + +#~ msgid "Linked" +#~ msgstr "Vinculado" #~ msgid "Unknown version" @@ -27514,4 +27597,9 @@ #~ "Não faça o upload de nenhuma informação depois desta mensagem." +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "" +#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto " +#~ "de dados" + #~ msgid "Error while parsing" #~ msgstr "Erro enquanto analisando" @@ -27602,7 +27690,22 @@ #~ "\">português." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset." + #~ msgid "Unexpected return value. Got {0}." #~ msgstr "valor não esperado de retorno. Veio {0}" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Não há primitiva com versão {0} neste histórico" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Não há versão válida na data ''{0}'' neste histórico" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "não foi encontrada versão anterior. Histórico está vazio." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "não foi encontrada a última versão. Histórico está vazio." + #~ msgid "Index out of bounds. Got {0}." #~ msgstr "índice fora dos limites. Obtido {0}" @@ -27610,4 +27713,7 @@ #~ msgid "Display the history of the selected primitive." #~ msgstr "Mostrar histórico da primitiva selecionada" + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Não pode procurar porque não exite informação carregada." #~ msgid "" Index: applications/editors/josm/i18n/po/ro.po =================================================================== --- applications/editors/josm/i18n/po/ro.po (revision 18772) +++ applications/editors/josm/i18n/po/ro.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-15 17:49+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 17:57+0000\n" "Last-Translator: Cezar Radu-Buterez \n" "Language-Team: Romanian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -31,20 +31,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "_Ajutor" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Se ignoră URL-ul prost format: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -65,21 +65,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -87,6 +85,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -98,12 +96,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Avertisment" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Se ingoră fişierul URL prost format: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -111,17 +118,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -129,8 +127,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -140,21 +138,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -178,8 +176,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -192,6 +193,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Eroare" @@ -212,6 +213,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -306,5 +307,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -313,27 +314,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -351,5 +352,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Anulează" @@ -361,19 +362,19 @@ "încărcate." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Vă rog selectați stratul țintă" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Selectați stratul țintă" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Fuzionează" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -382,5 +383,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -493,13 +494,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -597,20 +598,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -648,10 +649,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combină {0} căi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Selectează te rog cel puţin două căi pentru a le combina." @@ -697,10 +698,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -719,11 +720,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Suprascrie" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Fişierul există. Îl suprascriu?" @@ -770,5 +771,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -777,6 +778,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -792,7 +793,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -820,5 +820,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplicare" @@ -842,30 +842,30 @@ msgstr "Părăsiţi aplicaţia." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Toate Formatele" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportă ca GPX" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportă datele într-un fişier GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nimic de exportat. Obţineţi mai întâi nişte date." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -873,13 +873,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -898,8 +898,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -907,7 +907,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -930,9 +930,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -944,5 +944,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -950,5 +950,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exportă fișier GPX" @@ -1094,6 +1094,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Arhivă nouă" @@ -1222,5 +1222,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "" @@ -1308,11 +1308,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Salvează" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Salvează datele curente." @@ -1369,10 +1369,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Salvează datele curente într-un fişier nou." @@ -1389,29 +1389,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 +msgid "Show Status Report" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 -msgid "Show Status Report" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 msgid "Show status report with useful information that can be attached to bugs" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1563,5 +1563,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1569,5 +1569,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1614,55 +1614,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Înlocuieşte selecţia" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Șterge obiectele selectate." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Actualizează datele" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1671,5 +1668,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1677,29 +1674,29 @@ msgstr "Nu sunt schimbări de transmis." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Nimic de transmis. Mai întâi obţineţi nişte date." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1713,11 +1710,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1728,5 +1725,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1736,22 +1733,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1762,19 +1759,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1783,5 +1780,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1790,15 +1787,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1910,17 +1907,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Descarc date GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Descarcă date GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Descarc date" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1928,5 +1925,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1980,9 +1977,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2000,5 +1997,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2006,5 +2003,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2120,5 +2117,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2138,17 +2135,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2158,22 +2155,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2181,15 +2178,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Apropie" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2197,10 +2194,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Caută..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2209,57 +2206,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Vă rog introduceţi un şir de căutat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "Înlocuieşte selecţia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "adaugă la selecţie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "elimină din selecţie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "case sensitive" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "regular expression" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2267,34 +2264,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2302,43 +2299,43 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "modified - all changed objects" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2348,51 +2345,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Căutare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" @@ -2406,40 +2403,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2448,9 +2445,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2459,5 +2456,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2555,7 +2552,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2666,5 +2663,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2689,5 +2686,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2695,6 +2692,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2762,17 +2759,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2806,10 +2793,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2842,20 +2829,20 @@ msgstr "Secvenţă" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2877,10 +2864,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2922,5 +2909,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "" @@ -2976,10 +2963,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -2988,5 +2975,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -2995,5 +2982,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3002,5 +2989,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3009,5 +2996,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3015,5 +3002,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3022,5 +3009,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3029,5 +3016,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3036,5 +3023,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3043,10 +3030,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3127,25 +3114,25 @@ #. short symbol for South +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 +msgid "S" +msgstr "" + +#. short symbol for North #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 -msgid "S" -msgstr "" - -#. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 msgid "N" msgstr "" #. short symbol for West +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 +msgid "W" +msgstr "" + +#. short symbol for East #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 -msgid "W" -msgstr "" - -#. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 msgid "E" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3153,5 +3140,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3159,5 +3146,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3167,26 +3154,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3195,5 +3182,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3256,24 +3243,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3281,5 +3268,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3307,10 +3294,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3475,10 +3462,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3490,6 +3477,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3500,5 +3487,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3509,6 +3496,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3526,6 +3513,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "fundal" @@ -3543,19 +3530,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3569,26 +3572,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3603,10 +3631,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3614,32 +3642,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "incomplet" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3648,5 +3676,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3684,6 +3712,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Conflict" @@ -3693,11 +3721,11 @@ msgstr "Gazdă necunoscută" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3896,11 +3924,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4015,5 +4043,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4021,18 +4049,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "stratul nu este în listă." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4153,67 +4181,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4221,68 +4249,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4290,5 +4318,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4296,30 +4324,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4327,5 +4355,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4333,14 +4361,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4348,5 +4376,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4354,54 +4382,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Elimină" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4410,5 +4438,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4417,5 +4445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4424,5 +4452,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4431,5 +4459,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4438,6 +4466,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4446,6 +4474,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4456,5 +4484,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4466,5 +4494,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4473,19 +4501,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4494,9 +4522,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4506,5 +4534,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4528,84 +4556,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "şters" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4615,17 +4643,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4634,9 +4662,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4651,19 +4679,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4679,10 +4707,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4692,10 +4720,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4722,27 +4750,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4767,22 +4795,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4790,5 +4818,5 @@ msgstr "nici unul" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4879,6 +4907,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4889,5 +4917,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4901,21 +4929,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4923,5 +4951,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5008,10 +5036,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5031,13 +5059,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Rezolvă" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5045,5 +5073,5 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5054,25 +5082,25 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5084,13 +5112,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5102,8 +5130,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5170,5 +5198,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5200,34 +5228,34 @@ msgstr "Deschide o listă cu toate straturile încărcate." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Şterge stratul selectat." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Arată/Ascunde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Comută starea vizibilă a stratului selectat." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Mută stratul selectat un rând în sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Mută stratul selectat un rând în jos." @@ -5237,18 +5265,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Schimb {0} obiect" -msgstr[1] "Schimb {0} obiecte" -msgstr[2] "Schimb {0} de obiecte" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +#: ../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 @@ -5257,10 +5284,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Schimb valorile?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5269,5 +5296,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5276,9 +5303,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Vă rog selectaţi o cheie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Vă rog selectaţi o valoare" @@ -5303,102 +5330,98 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Şterge cheia selectată din toate obiectele" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Editează valoarea cheii selectata pentru toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Şterge cheia selectată din toate obiectele" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 +msgid "Open an editor for the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 +msgid "Delete the selected relation" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 -msgid "Open an editor for the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -msgid "Delete the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 msgid "Create a new relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5427,5 +5450,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5437,14 +5460,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5525,12 +5548,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5548,5 +5571,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5554,5 +5577,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5560,18 +5583,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5580,14 +5603,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5597,9 +5620,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5609,15 +5632,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5625,5 +5648,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5631,20 +5654,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5653,66 +5676,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5721,9 +5744,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5732,41 +5755,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5776,19 +5799,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Descarc date" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5809,10 +5839,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5826,5 +5852,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5894,9 +5920,9 @@ msgstr "Semne de carte" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5905,52 +5931,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5958,52 +5984,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 +msgid "Data Sources and Types" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 -msgid "Data Sources and Types" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "OpenStreetMap data" msgstr "Date OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Date GPS neprelucrate" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 +msgid "Download as new layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 -msgid "Download as new layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6011,38 +6037,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 +msgid "Download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 +msgid "No area selected yet" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 +msgid "Download area too large; will probably be rejected by server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 +msgid "Download area ok, size probably acceptable to server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +msgid "Click to close the dialog and to abort downloading" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 -msgid "Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 -msgid "No area selected yet" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 -msgid "Download area too large; will probably be rejected by server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 -msgid "Download area ok, size probably acceptable to server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 -msgid "Click to close the dialog and to abort downloading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6064,21 +6090,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6817,8 +6843,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -6991,5 +7017,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7001,5 +7027,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7046,5 +7072,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7058,5 +7084,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7067,5 +7093,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7074,19 +7100,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7096,32 +7122,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7143,5 +7169,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7233,33 +7259,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Apropie la {0}" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Istoric" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7285,7 +7309,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7352,12 +7375,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Versiune {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "şters" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7415,10 +7437,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7629,5 +7651,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7650,17 +7672,17 @@ msgstr "Strat" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7676,7 +7698,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7719,29 +7741,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7749,38 +7771,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7788,16 +7810,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7841,24 +7863,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Imagini pentru {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Nu există timp pentru punctul {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7866,33 +7888,33 @@ msgstr "Citesc {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Nu am găsit imagini cu mărci de timp citibile." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Imagini geoetichetate" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Start GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Sfârşit GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "diferentă curentă: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "diferenţă zonă de timp: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7902,14 +7924,14 @@ msgstr[2] "de imagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} în urmă." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Sincronizare ceas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7917,32 +7939,32 @@ msgstr "Imagine JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Nu există timp EXIF în fişierul \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Imagine" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizare timp cu unitatea GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Timpul introdus nu a putut fi interpretat." @@ -8032,5 +8054,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8082,10 +8104,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Converteşte la strat de date" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8093,11 +8115,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8107,29 +8129,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8138,9 +8160,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8148,5 +8170,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8154,23 +8176,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8179,5 +8201,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8191,5 +8213,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8202,11 +8224,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8215,21 +8237,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} constă în:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" msgstr "" @@ -8329,9 +8363,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Show/Hide Text/Icons" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 -msgid "Show/Hide Text/Icons" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8393,5 +8427,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8399,5 +8433,5 @@ msgstr "Vă rog selectaţi rândul care va fi editat." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8405,5 +8439,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8412,5 +8446,5 @@ msgstr "Vă rog selectaţi rândul care va fi şters." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "" @@ -8533,40 +8567,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Culoare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Alegeţi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Alegeţi o culoare pentru {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Culori utilizate de diferite obiecte în JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Culori" @@ -9001,17 +9035,17 @@ msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Metodă de proiecţie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9021,5 +9055,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9077,81 +9111,81 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9160,6 +9194,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9325,10 +9359,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9338,13 +9372,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9352,18 +9386,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9374,15 +9408,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Eroare la prelucrarea {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9393,18 +9427,18 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Modificare proprietăţi" @@ -9420,6 +9454,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9428,8 +9462,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Descarc punctele {0} până la {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9542,11 +9589,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9556,40 +9603,40 @@ msgstr "Descarc datele OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9652,5 +9699,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9663,66 +9710,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9757,5 +9804,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9782,5 +9829,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9788,5 +9835,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9799,5 +9846,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9950,5 +9997,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9957,38 +10004,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -9996,19 +10043,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Obiect ilegal cu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10018,10 +10065,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10031,25 +10076,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10490,5 +10535,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10497,12 +10542,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10512,5 +10550,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10520,10 +10558,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10532,5 +10565,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10539,5 +10572,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10546,9 +10579,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10558,5 +10598,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10565,5 +10605,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10572,5 +10612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10579,10 +10619,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10591,10 +10631,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10605,5 +10645,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10613,5 +10653,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11318,5 +11358,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11329,28 +11369,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11380,13 +11437,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11395,13 +11452,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11681,43 +11738,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11725,5 +11787,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11754,5 +11816,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11780,5 +11842,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11786,28 +11848,28 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11816,24 +11878,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12859,20 +12912,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -12994,13 +13047,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13570,5 +13619,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +msgid "Unconnected coastline" msgstr "" @@ -14210,12 +14259,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "descărcare" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Descarcă hărţi de la serverul OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14318,29 +14365,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14349,5 +14396,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14355,10 +14402,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14371,24 +14418,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14399,57 +14446,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Salvează strat WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Semne de carte" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26759,8 +26811,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26780,34 +26831,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26817,9 +26857,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26833,12 +26876,69 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" msgstr "" Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 18772) +++ applications/editors/josm/i18n/po/ru.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-13 20:06+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-23 19:23+0000\n" "Last-Translator: Calibrator \n" "Language-Team: Koptev Oleg \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -30,20 +30,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -64,21 +64,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -86,6 +84,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -97,12 +95,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Предупреждение" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнорирование неправильной ссылки на файл: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Не удалось прочитать файл ''{0}''.
Ошибка:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -110,17 +117,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Не удалось прочитать файл ''{0}''.
Ошибка:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -128,8 +126,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -139,21 +137,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -177,8 +175,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -191,6 +192,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Ошибка" @@ -211,6 +212,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -312,5 +313,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -319,27 +320,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -357,5 +358,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Отмена" @@ -367,19 +368,19 @@ "линию или отношение." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Пожалуйста выберите целевой слой." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Выбор слоя" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Объединить" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -390,5 +391,5 @@ "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Не выбран слой" @@ -501,13 +502,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -606,20 +607,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Пакеты правок не открыты" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Нет открытых пакетов правок" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -659,10 +660,10 @@ "последовательностью точек." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Объединить {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." @@ -707,10 +708,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -729,11 +730,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Перезаписать" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Файл уже существует. Перезаписать?" @@ -780,5 +781,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -787,6 +788,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -802,7 +803,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -830,5 +830,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Дублировать" @@ -852,30 +852,30 @@ msgstr "Выйти из программы" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Все форматы" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Экспорт в GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Экспортировать данные в GPX файл" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Нет данных для экспорта. Создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -883,13 +883,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -908,8 +908,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -917,7 +917,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -940,9 +940,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -954,5 +954,5 @@ msgstr "параметр ''{0}'' не должен быть null" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -960,5 +960,5 @@ msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Экспорт GPX-файла" @@ -1106,6 +1106,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Создать" @@ -1243,5 +1243,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Вставить" @@ -1331,11 +1331,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Сохранить" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Сохранить текущие данные." @@ -1392,10 +1392,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Сохранить как..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Сохранить текущие данные в новый файл." @@ -1414,10 +1414,10 @@ "незаконченные объекты." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Показать отчёт о состоянии" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1425,20 +1425,20 @@ "прикрепить к сообщению об ошибке" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Справка: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Отчёт о состоянии" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Скопировать в буфер и закрыть" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1613,5 +1613,5 @@ msgstr "Неприкрепленная точка" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1619,5 +1619,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1664,23 +1664,22 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Скачать данные" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Не найден текущий набор данных" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Объект с id {0} не найден в текущем наборе данных" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Обновить выделенное" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Обновить выбор" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1689,32 +1688,30 @@ "заново)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Обновить выборку" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Не выделены элементы для обновления." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "Нет выбранных объектов для обновления." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Выборка пуста" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Удалить объекты" - +msgstr "Обновить объекты" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Загрузить данные на сервер" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "Передать все изменения в активном слое на сервер OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1725,5 +1722,5 @@ "устранить." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1731,29 +1728,29 @@ msgstr "Нет изменений для загрузки на сервер." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Синхронизировать только точку {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Синхронизировать только линию {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Синхронизировать только отношение {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Синхронизировать весь набор данных" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1775,11 +1772,11 @@ "редактирование.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Обнаружены конфликты" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1795,5 +1792,5 @@ "продолжите редактирование.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1807,22 +1804,22 @@ "пакет правок." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Пакет правок закрыт" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "Подготовить устранение конфликта" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "Щёлкните, чтобы отменить и подтвердить правку карты" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1838,10 +1835,10 @@ "устранить в диалоге устранения конфликтов." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "Точка ещё используется" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" @@ -1850,9 +1847,9 @@ "образцу" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Обновление элемента" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1861,5 +1858,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1870,5 +1867,5 @@ "снова на сервер, но без этого объекта." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." @@ -1877,10 +1874,10 @@ "сервер." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "Передача объектов на сервер. Кол-во: {0}..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1994,17 +1991,17 @@ msgstr "Играть медленнее." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Скачивание данных GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Скачанные GPX данные" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Скачивание данных" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -2014,5 +2011,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "В этом месте нет данных." @@ -2073,9 +2070,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Ошибка во время скачивания" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "Ошибки при скачивании с сервера" @@ -2095,5 +2092,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2101,5 +2098,5 @@ msgstr "Режим: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2199,7 +2196,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши." +msgstr "" +"Переместите сегмент вдоль его перпендикуляра, затем отпустите кнопку мыши." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2208,9 +2205,10 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник" +msgstr "" +"Переместите сегмент линии, чтобы создать прямоугольник. Ужерживая Ctrl, " +"переместите, сегмент вдоль его перпендикуляра." #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2225,5 +2223,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2244,17 +2242,17 @@ msgstr[2] "Добавьте или переместите новую виртуальную точку на {0} линий" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Переместить элементы" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Переместить" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Отмена перемещения" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2267,13 +2265,13 @@ "часто производится по ошибке. Действительно переместить их?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Всегда перемещать и больше не показывать этого предупреждения" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2282,9 +2280,9 @@ "объединения с ближайшей точкой." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Отпустите кнопку мыши, чтобы прекратить вращение." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2295,15 +2293,15 @@ "выделите что-либо другое" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Масштаб" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Изменять масштаб и двигать карту" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2313,10 +2311,10 @@ "карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Поиск..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2325,58 +2323,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Пожалуйста, введите строку фильтра" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Пожалуйста, введите строку для поиска." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "регулярное выражение" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "Введите выражение для поиска" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "заменить выделение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "добавить к выделению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "убрать из выделения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "найти в выделенном" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "регистрозависимый" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "регулярное выражение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' и 'Street' в любом ключе или названии." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' в любом ключе или названии." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' в любом месте названия." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - ключ 'type' с точным значением 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2386,17 +2383,17 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - название не содержит 'Bak'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot устанавливает в любых значениях." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Специальные цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" @@ -2405,17 +2402,17 @@ "(линия), relation(отношение)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - все объекты, измененные заданным пользователем" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - объект с данным ID (0 для новых объектов)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "точки:... - объект с заданным количеством точек" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2425,21 +2422,21 @@ "мин-макс)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - все измененные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - все выделенные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - все незаконченные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - все объекты без тегов" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" @@ -2448,5 +2445,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" @@ -2455,5 +2452,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2461,5 +2458,5 @@ "«или»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2467,9 +2464,9 @@ "ключ содержит двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Используйте ( and ) для группировки выражений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2479,51 +2476,51 @@ msgstr "Фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Принять фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Начать поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Не найдено совпадений для ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ничего не удалено из выделения в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Ничего не найдено в выделенном, при поиске ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Найдено {0} совпадений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2540,5 +2537,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2546,10 +2543,10 @@ "использования: ключ=значение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2558,26 +2555,26 @@ "отношение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Неожиданный знак: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Отсутствуют параметры для \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Отсутствуют параметры для \"НЕ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Отсутствует закрывающая скобка" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "Неверное количество параметров оператора tags." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2588,9 +2585,9 @@ "выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Неверное число параметров для оператора точек." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2601,5 +2598,5 @@ "или диапазон, например, точки:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2708,7 +2705,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2821,5 +2818,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Двойной конфликт" @@ -2846,5 +2843,5 @@ msgstr "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2852,6 +2849,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "не могу устранить нерешенный конфликт" @@ -2864,7 +2861,7 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60 -#, fuzzy msgid "At least one object to delete required, got empty collection" -msgstr "По крайней мере, один удаляемый элемент получил пустую коллекцию" +msgstr "" +"Требуется удалить, по крайней мере, один объект, получена пустая коллекция" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106 @@ -2926,18 +2923,8 @@ msgstr "Удалить подтверждение" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Устранить конфликт при удалении {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2973,10 +2960,10 @@ msgstr "Удаление ссылки из отношения {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Устранить конфликты в списке участников отношения {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -3010,20 +2997,20 @@ msgstr "Последовательность" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Устранить {0} конфликтов тегов в точке {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Устранить {0} конфликтов тегов в линии {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Устранить {0} конфликтов тегов в отношении {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -3045,10 +3032,10 @@ msgstr "Устранить конфликты версий для отношения {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Устранить конфликты в списке точек линии {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3092,5 +3079,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Новое значение" @@ -3137,7 +3124,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "требуется параметр ''{0}'' > 0. Получен {1}" +msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3146,10 +3133,10 @@ msgstr "Ошибка: не удается сохранить свойства для ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ошибка в файле конфигурации на строках {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3160,5 +3147,5 @@ "не является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3169,5 +3156,5 @@ "является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3178,5 +3165,5 @@ "отсутствующий каталог параметров: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3187,5 +3174,5 @@ "каталог параметров: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3195,5 +3182,5 @@ "параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3204,5 +3191,5 @@ "параметров по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3213,5 +3200,5 @@ "параметров к состоянию по умолчанию: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3222,5 +3209,5 @@ "резервный
{0}
а новый будет создан с параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3231,10 +3218,10 @@ "параметров {0} к состоянию по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3323,25 +3310,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "Ю" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "С" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "З" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3349,5 +3336,5 @@ msgstr "Пакет правок {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3356,5 +3343,5 @@ "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3367,34 +3354,34 @@ "критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +msgstr "Отстутствует результат слияния для линии с id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +msgstr "Отстутствует результат слияния для объекта с id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Отсутствуют параметры для \"НЕ\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "Отстутствует результат слияния для точки с id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "История для отношения {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "Отстутствует результат слияния для отношения с id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" +msgstr "Отсутствует результат слияния типа {0} с id {1}" #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3402,7 +3389,7 @@ "Keeping target object. " msgstr "" -"Мой элемент с id {0} и версией {1} видимый, хотя чужой элемент с более " -"низкой версией {2} невидим. Невозможно справиться с этой несовместимостью. " -"Сохраняю мой элемент. " +"Полученный объект с id {0} и версией {1} видимый, хотя оригинал с более " +"низкой версией {2} не видимый. Это несоответствие невозможно. Полученный " +"объект сохранён. " #. translators notes must be in front @@ -3459,34 +3446,37 @@ msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "обнаружен id >= 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "Элемент с id=0 не может быть невидимым" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "обнаружено id > 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "обнаружена версия > 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " "other is not" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +"Слияние невозможно, потому что, один из участвующих элементов новый, а " +"другой нет" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" "Can''t merge primitives with different ids. This id is {0}, the other is {1}" msgstr "" +"Слияние элементов с различными id невозможно. Этот id: {0}, другой же: {1}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37 @@ -3512,13 +3502,14 @@ "несколькими значениями." -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +"Найден пользователь с тем же идентификатором пользователя, но с другим именем" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." -msgstr "невозможно добавить узел {0} к незавершённой линии {1}" +msgstr "невозможно добавить точку {0} к незавершённой линии {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54 @@ -3526,7 +3517,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "требуется параметр ''{0}'' > 0. Получен {1}" +msgstr "Ожидался параметр ''{0}'' > 0, получено {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3545,7 +3536,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "Невозможно сравнить элемент с id ''{0}'' и элемент с id ''{1}''" +msgstr "Невозможно сравнить элемент с ID ''{0}'' и элемент с ID ''{1}''." #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3686,10 +3677,10 @@ msgstr "для_текста" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Ошибка: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3701,6 +3692,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3711,5 +3702,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3720,6 +3711,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3738,6 +3729,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "фон" @@ -3755,24 +3746,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"ВАЖНО : данные расположены слишком\n" -"далеко от текущих границ Lambert зоны.\n" -"Не загружайте пока никаких данных .\n" -"Отмените последнее действие, сохраните\n" -"данные и начните новый слой в новой зоне." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "Lambert 4 Zones (Франция)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Зона Ламберта" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "Lambert CC9 Zone (Франция)" @@ -3786,27 +3789,56 @@ msgstr "Проекция Меркатора" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Зона UTM" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Швейцарская проекция" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "Зона UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3821,10 +3853,10 @@ msgstr "Невозможно записать закладку.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Больше не показывать" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3832,32 +3864,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "неполный" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "дорога" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "железная дорога" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "водоём" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "землепользование" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3867,5 +3899,5 @@ msgstr[2] "{0} точек" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3904,6 +3936,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Конфликт" @@ -3913,11 +3945,11 @@ msgstr "Неизвестный хост" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Объект удалён" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4126,11 +4158,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4245,5 +4277,5 @@ msgstr "Длина создаваемого сегмента линии" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4253,18 +4285,18 @@ "
Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(нет объекта)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Пользователь:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "слоя нет в списке." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4392,50 +4424,50 @@ msgstr "роль {0} не участвует в паре сравнения {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Параметры" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Теги" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Точки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Участники" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Нет конфликтов тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Теги ({0} конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} неустранённых конфликтов тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Точки (без конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4444,17 +4476,17 @@ "точек этой линии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Точки (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Неустранённые конфликты в списке точек этой линии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Члены (без конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4464,30 +4496,30 @@ "конфликтов в списке участников этого отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Участники отношений(с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Неразрешённые конфликты в списке участников этого отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Нет актуальных конфликтов свойств" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Свойства (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Конфликты свойств, ожидающие устранения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Конфликт в разрешении изображения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." @@ -4495,38 +4527,38 @@ "текущее значение параметра вне допустимой области: текущее значение {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "Список в роли {0} в настоящий момент не учавствует в сравнении пары." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "недопустимое значение параметра \"index\". Текущее значение {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "пункт {0} не найден в списке" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "блокировать прокрутку" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Сравнить " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Моя версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4534,5 +4566,5 @@ msgstr "Объединённая версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4542,30 +4574,30 @@ "объединении будет принято." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Их версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Список элементов в их наборе данных, набор данных на сервере" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> наверх" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Скопировать выделенные точки в начало списка объединённых точек" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> вниз" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "Скопировать выделенные элементы в конец списка объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4575,5 +4607,5 @@ "объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4583,5 +4615,5 @@ "списке объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4589,10 +4621,10 @@ "Скопировать их выделенные элементы в начало списка объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Скопировать их выделенные элементы в конец списка объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4602,5 +4634,5 @@ "списке объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4610,54 +4642,54 @@ "списке объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Вверх" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Поднять выделенные элементы на одну позицию" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Вниз" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Опустить выделенные элементы на одну позицию" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Удалить" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Удалить выделенные записи из списка объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Заблокировать" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Заблокировать текущий список объединённых элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Разблокировать" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Разблокировать список объединённых элементов и начать объединение" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4668,5 +4700,5 @@ "записей" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4677,5 +4709,5 @@ "записей" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4685,5 +4717,5 @@ msgstr[2] "Моя версия ({0} записей)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4693,5 +4725,5 @@ msgstr[2] "Объединённая версия ({0} записей)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4701,6 +4733,6 @@ msgstr[2] "Их версия ({0} записей)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4711,6 +4743,6 @@ "синхронизированных регулировках." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4721,5 +4753,5 @@ msgstr "Узел" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4733,5 +4765,5 @@ msgstr "Неожиданный индекс столбца. Получено {0}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4742,19 +4774,19 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Связь с сервером прервана" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Да, восстановить их тоже" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Нет, отменить действие" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4766,9 +4798,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Восстановить дополнительные точки?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4781,5 +4813,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Восстановить связанные элементы?" @@ -4805,84 +4837,84 @@ msgstr "Координаты:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Удалён:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Видим:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(отсутствует)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "удалён" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "не удалён" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "видим (на сервере)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "невидим (на сервере)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Оставить клон локальной версии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Физически удалить из локального набора данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Оставить мои координаты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Оставить их координаты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Восстановить конфликт между различными координатами" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Оставить моё состояние \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Оставить их состояние \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Восстановить конфликт между состояниями \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Оставить моё состояние \"Видим\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Да, сбросить id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Нет, прервать" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4895,17 +4927,17 @@ "получит новое значение.
Вы согласны?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Сбросить в 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Оставить их состояние \"Видим\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Да, очистить" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4916,9 +4948,9 @@ "согласны?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Удалить из набора данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Восстановить конфликт между состояниями \"Видим\"" @@ -4935,19 +4967,19 @@ "устранения конфликтов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<не определено>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4963,10 +4995,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4976,10 +5008,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5008,27 +5040,27 @@ msgstr "Их версия (серверный набор данных)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Оставить выделенные пары ключ/значение из локального набора данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Оставить выделенных пары ключ/значение из серверного набора данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Восстановить конфликт" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Пометить выделенные теги, как неулаженные конфликты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -5053,22 +5085,22 @@ msgstr "Конфликтов не обнаружено" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Отменить устранение конфликтов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Применить устранённые конфликты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Применить" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5076,5 +5108,5 @@ msgstr "ничего" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5167,6 +5199,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5178,5 +5210,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5192,21 +5224,21 @@ "Позиция {0} за пределами допустимого. Текущее количество участников {1}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "Удалить этого участника из отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 msgid "Keep" msgstr "Сохранить" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 msgid "Keep this relation member for the target object" msgstr "Сохранить этого участника отношений для получаемого объекта" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "Нерешённый" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "Ещё не решено" @@ -5214,5 +5246,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Роль:" @@ -5315,10 +5347,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5338,13 +5370,13 @@ msgstr "Стек команд: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "Устранить конфликты." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Устранить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5352,5 +5384,5 @@ "объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5359,25 +5391,25 @@ msgstr "Выделить на карте объекты, выбранные в списке вверху." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Отменить устранение конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Применить устранение конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Применить устранение конфликтов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Закрыть в любом случае" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Продолжить решение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5395,13 +5427,13 @@ "улаживанию конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Конфликт устранён не полностью" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Устранить конфликты" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5413,8 +5445,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5481,5 +5513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5511,34 +5543,34 @@ msgstr "Показать список всех загруженных слоёв." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Удалить выделенный слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Показать/скрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Показать/скрыть выделенный слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Включить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Активировать выделенный слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Объединить этот слой с другим слоем" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Переместить выделенный слой вверх." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Переместить выделенный слой вниз." @@ -5548,19 +5580,18 @@ msgstr "Информация о слое" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Количество изменяемых объектов: {0}" -msgstr[1] "Это изменит до {0} объектов." -msgstr[2] "Это изменит до {0} объектов." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "Это изменить {0} объект." +msgstr[1] "Это изменит {0} объекта." +msgstr[2] "Это изменит {0} объектов." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." msgstr "Пустое значение удаляет тег." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +#: ../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 @@ -5569,10 +5600,10 @@ msgstr "<различные>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Изменить значения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5582,5 +5613,5 @@ msgstr[2] "Изменить параметры {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5590,9 +5621,9 @@ msgstr[2] "Это изменит до {0} объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Пожалуйста, выберите ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Выберите значение" @@ -5616,102 +5647,98 @@ msgstr "Член группы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Добавить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Свойств: {0} / Участников: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Параметры / Участники" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Изменить отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Удалить из отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Удалить выделенный ключ из всех объектов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Удалить параметры" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Добавить новую пару ключ/значение для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Изменить параметры" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Изменить значение выбранного ключа для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Свойств: {0} / Участников: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Параметры / Участники" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Изменить отношение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Удалить из отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Удалить выделенный ключ из всех объектов" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Удалить параметры" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Показать список всех отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Отношения: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Открыть редактор для выбранного отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Удалить выбранное отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Создать новое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "Создать копию этого отношения и открыть его в другом окне редактора" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "Установить текущий выбор на списке выделенных отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "Выделите участников всех выбранных отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "Выбрать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "Скачать с сервера всех участников выделенных отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "Скачать участников" @@ -5740,5 +5767,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5750,9 +5777,9 @@ msgstr "Выбор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Отсоединить панель" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5761,5 +5788,5 @@ "панели." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Щёлкните для уменьшения/увеличения содержимого панели" @@ -5847,12 +5874,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Скачать участников отношений" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Конфликт в данных" @@ -5871,5 +5898,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5877,5 +5904,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5885,18 +5912,18 @@ "Исключение: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Теги и участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Родительские отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Дочерние элементы отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5908,14 +5935,14 @@ "хотите продолжать с циклическими отношениями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Удалить их, почистить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Игнорировать их, оставить отношение как есть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5928,9 +5955,9 @@ "участника отношения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Несколько участников, относящихся к одному и тому же элементу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5943,5 +5970,5 @@ "''{0}'' будет пропущено." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5950,5 +5977,5 @@ "участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5957,5 +5984,5 @@ "участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5965,5 +5992,5 @@ "выделенным участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5973,20 +6000,20 @@ "выделенного участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "Удалить всех участников, относящихся к каждому из выделенных элементов" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Редактор отношений: удалить выделенное" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Выделить участников отношения, которые относятся к выбранным элементам" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5997,61 +6024,61 @@ "выделенных элементов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "Выделить элементы для выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Сортировать участников отношений" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Редактор отношений: сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Переместить выделенных участников отношения вверх" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Редактор отношений: поднять" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Переместить выделенных участников отношения вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Редактор отношений: опустить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Удалить отмеченных участников из отношения" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Редактор отношений: удалить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Удалить редактируемое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Да, создать конфликт и закрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "Нет, продолжить редактирование" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" @@ -6060,5 +6087,5 @@ "отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -6070,9 +6097,9 @@ "создать конфликт и закрыть редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Конфликт в данных" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -6083,41 +6110,41 @@ "
Пожалуйста, устраните этот конфликт, прежде чем продолжать." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Записать внесённые изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Применить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Отменить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Добавить пустой тег" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Скачать недостающие части линий и точки, участвующие в отношении" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Редактор отношений: скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Задать роль для выделенных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Применить роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -6130,19 +6157,26 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Да, записать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "Нет, не записывать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Подтвердить пустую роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "Выделенный, при редактировании отношения, участник относится к" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Скачивание отношения {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -6152,8 +6186,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "" -"Приблизиться к элементу, к которому относится первый выделенный участник" +msgstr "Масштабирование приближает к первому выбранному объекту" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -6165,11 +6197,7 @@ msgstr "Масштабирование отменено, потому что вы не выбрали участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Ссылается на" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Связанные" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6182,5 +6210,5 @@ msgstr "Ожидалось значение child.getId() > 0. Получено {1}." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6255,10 +6283,10 @@ msgstr "Закладки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" "В настоящий момент не выбрана область для скачивания с сервера." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6269,13 +6297,13 @@ "minlon, maxlat, maxlon): {0}, {1}, {2}, {3}" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "Создать закладку" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "Добавить закладку к области, выделенной в настоящий момент" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." @@ -6284,40 +6312,40 @@ "её." +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." +msgstr "" +"Пожалуйста, введите название закладки для скачиваемой с сервера области." + #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" -"Пожалуйста, введите название закладки для скачиваемой с сервера области." - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "Название места" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "Удалить выделенные закладки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "Переименовать выделенные закладки" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "мин. широта" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "мин. долгота" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "макс. широта" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "макс. долгота" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6327,52 +6355,52 @@ "область)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Рамка" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "Строка ''{0}'' не является правильным двойным значением." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "Значение широты должно быть в пределах [-90,90]." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "Значение долготы должно быть в пределах [-180,180]." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "Вставьте ссылку из буфера" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Источники и типы данных" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Данные OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "Пометьте, чтобы скачать с сервера данные OSM, для выделенной области." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Данные GPS" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделеной области." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Скачать как новый слой" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6382,18 +6410,18 @@ "пометку, чтобы скачать данные с сервера в текущий активный слой." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Область для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Скачать" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "Область ещё не выбрана" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -6401,21 +6429,21 @@ "запрос." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Область для скачивания приемлема по площади." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "Нажмите, чтобы закрыть диалог и прервать скачивание с сервера" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "Нажмите, чтобы скачать с сервера выделенную область" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "Пожалуйста, выделите сначала область для скачивания с сервера." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6440,21 +6468,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Пустой указатель исключение, возможно есть отсутствующие теги" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "Найти ..." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "Нажмите, чтобы начать поиск мест" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "Запрос на сервер имён" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "Запрос на сервер имён ..." @@ -7193,8 +7221,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7367,5 +7395,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7377,5 +7405,5 @@ msgstr "Тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "Возле" @@ -7426,5 +7454,5 @@ msgstr "Браузер справки JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7445,5 +7473,5 @@ "статью help на английском языке.

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7458,5 +7486,5 @@ "
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7467,19 +7495,19 @@ "сети проблемы, поэтому проверьте
ваше интернет-соединение" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "Не удалось открыть ссылку" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "Открыть текущую страницу справки во внешнем браузере" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "Править текущую страницу справки" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7491,33 +7519,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "Загрузить заново текущую страницу справки" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "Перейти на предыдущую страницу" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "Перейти на следующую страницу" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "Перейти на начальную страницу справки JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" "Предупреждение: плохое расположение в документе HTML. Исключение было: " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 msgid "Failed to open help page. The target URL is empty." msgstr "Не удалось открыть справочную страницу. Ссылка пуста." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 msgid "Failed to open help page" msgstr "Не удалось открыть справочную страницу" @@ -7540,5 +7568,5 @@ msgstr "Долгота: " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "Координаты" @@ -7604,12 +7632,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "требуется параметр ''{0}'' > 0. Получен {1}" +msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "требуется параметр id ''{0}'' > 0. Получен {1}" +msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7634,33 +7662,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Точка {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "Приблизиться к точке" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Приблизиться к проблеме" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" -msgstr "" +msgstr "Приблизиться к этой точке в текущем слое" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "Показать историю" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Загрузить историю" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +msgstr "Открыть историю этой точки с помощью браузера" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Линия {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7669,7 +7695,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Сортировать меню заготовок" +msgstr "не существует" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7687,7 +7712,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7715,21 +7739,21 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" +"Версия {0} в настоящий момент отредактирована в слое " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 +#, java-format +msgid "" +"Version {0} created on {1}" +msgstr "" "Версия {0} Создано на {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 -#, java-format -msgid "" -"Version {0} created on {1}" -msgstr "" -"Версия {0} Создано на {1}" - #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "<анонимный>" +msgstr "анонимный" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7757,17 +7781,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Версия {0}" +msgstr "Версия {0} в редакторе" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "удалён" +msgstr "[удалено]" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Версия {0} дата создания: {1} автор: {2}" +msgstr "Версия {0} в настоящий момент отредактирована в слое данных ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7821,10 +7844,10 @@ msgstr "Закрытие пакета правок {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "Открыть диалог выбора файла" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Выберите имя файла" @@ -8075,5 +8098,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -8096,17 +8119,17 @@ msgstr "Слой" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Следует загрузить на сервер?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Следует сохранить?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Имя файла" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -8123,7 +8146,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Теги нового пакета правок" @@ -8169,13 +8192,13 @@ msgstr[2] "Удалить {0} объектов:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Загрузить изменения на сервер" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Загрузить на сервер изменённые элементы" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" @@ -8183,17 +8206,17 @@ "(мин. 3 символа)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "неверный комментарий загрузки на сервер" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Отменить загрузку на сервер и продолжить редактирование" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Загрузить все изменения на сервер одним запросом" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -8203,40 +8226,40 @@ "отключите, чтобы делать отдельный запрос для каждого изменённого элемента" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Прокомментируйте данные, загружаемые на сервер:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Открыть новый пакет правок" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" "Открыть новый пакет правок и использовать его в следующей загрузке на сервер" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Использовать открытый пакет правок" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Загрузить данные на сервер в уже открытый пакет правок" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "Закрыть пакет правок после загрузки на сервер" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" "Выбрать, какой пакет правок надо закрыть, после следующей загрузки на сервер" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -8244,16 +8267,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Загрузите с сервера список открытых вами пакетов правок" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Закрыть открытый пакет правок, выбранный в настоящий момент" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8303,24 +8326,24 @@ msgstr "Продолжить загрузку на сервер" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Изображения для {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Прочесть GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Нет указания времени для точки {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Невозможно прочесть время \"{0}\" у точки {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8328,33 +8351,33 @@ msgstr "Чтение {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Не найдено изображений с информацией о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Изображения с данными о местоположении" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Начало GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Конец GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "текущая разница: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "разница в часовых поясах: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8364,14 +8387,14 @@ msgstr[2] "изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} в пределах трека" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Синхронизация часов" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8379,32 +8402,32 @@ msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Невозможно прочесть дату из файла \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "EXIF файла \"{0}\" не содержит информации о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Часовой пояс GPS объекта (отличается от фотографии)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизировать время с GPS приёмником" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Введённое время невозможно использовать" @@ -8494,5 +8517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8547,10 +8570,10 @@ msgstr[2] "{0} путевых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Преобразовать в слой данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8560,11 +8583,11 @@ "считается вредоносной.
Если хотите загрузить треки, ознакомьтесь с этим:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8574,29 +8597,29 @@ msgstr "Преобразовано из: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Скачать с OSM данные вдоль этого трека" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Скачать всё в пределах:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} метров" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Максимальная область для одного запроса:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8607,9 +8630,9 @@ "Продолжить?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "На слое отсутствует трек GPX, чтобы наложить звук." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8619,5 +8642,5 @@ "будут пропущены или перенесены в начало трека." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8627,24 +8650,24 @@ "проигнорированы при рассчете времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Слой данных {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8654,5 +8677,5 @@ msgstr[2] "Обнаружено {0} конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8676,5 +8699,5 @@ "удалёны на сервере." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8694,11 +8717,11 @@ "конфликтов и устраните конфликты вручную." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8708,22 +8731,35 @@ msgstr[2] "{0} удалено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Не найдена линия \"от\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8832,9 +8868,9 @@ msgstr "Нет существующих аудио маркеров на этом слое" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Показать/скрыть текст/значки" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Показать/скрыть текст и значки маркеров." @@ -8900,5 +8936,5 @@ msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8906,5 +8942,5 @@ msgstr "Пожалуйста, выберите ряд для редактирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8912,5 +8948,5 @@ msgstr "Новое значение для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8919,5 +8955,5 @@ msgstr "Пожалуйста, выберите ряд для удаления." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Введите новый ключ и значение" @@ -9057,40 +9093,40 @@ msgstr "Калибровка звукозаписи" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Цвет" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Стиль рисования {0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Слой: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Выбрать" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Выберите цвет для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Установить значение по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Установить все значения по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Цвета, используемые разными объектами в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Цвета" @@ -9539,17 +9575,17 @@ msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Отображать координаты как" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Тип проекции" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "Код проекции" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "Границы" @@ -9559,5 +9595,5 @@ msgstr "Картографическая проекция" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9615,81 +9651,81 @@ msgstr "Горячая клвиша" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "Активные стили" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "Доступные стили (из {0})" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Пути к иконкам" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Краткое описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Автор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Веб-страница: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "Добавить название файла или ссылку на активные стили" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "Удалить выбранные стили из списка активных стилей" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "Заменить имя файла или ссылку для выбранного активного стиля" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "Добавить выделенные доступные стили к списку активных стилей" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "Скачать заново список доступных стилей из ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "Добавить новый путь к значкам" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "Удалить выделенные пути к значкам" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "Править выделенные пути к значкам" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "Загрузить источники стилей из ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9700,6 +9736,6 @@ "

Подробности (на англ.):
{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9889,10 +9925,10 @@ msgstr "Группы модификаторов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "<множественный>" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9903,13 +9939,13 @@ msgstr[2] "Удалить старые ключи из {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Добавить новый тег" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Удалить отмеченное в таблице тегов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9917,18 +9953,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Дополнительные атрибуты:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "замкнутая линия" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестный тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9939,15 +9975,15 @@ msgstr "Не удалось прочитать источник заготовок тегов: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9958,18 +9994,18 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ничего не выделено!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Неудачный выбор!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Применить шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Изменить параметры" @@ -9985,6 +10021,6 @@ msgstr "Группа заготовок {0}" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9993,8 +10029,21 @@ msgstr "Подключение к серверу OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Скачивание точек с {0} до {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\"" #. SAXException does not chain correctly @@ -10111,5 +10160,5 @@ msgstr "Неизвестный режим {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -10118,6 +10167,6 @@ "элемента." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -10127,40 +10176,40 @@ msgstr "Скачивание данных OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Выборка точки с id {0} из ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Выборка линии с id {0} из ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Выборка отношения с id {0} из ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Выборка пакета точек из ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Выборка пакета линий из ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Выборка пакета отношений из ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10227,5 +10276,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -10240,66 +10289,66 @@ "\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Создание пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "Успешно открытый пакет правок {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Обновление пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Обновление пакета правок {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Закрытие пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Нет пакетов правок для загрузки отличий" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Загрузка на сервер..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Ожидание 10 секунд ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Попытка {0} из {1} через {2} секунды..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - пробуем ещё раз." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "Попытка {0} из {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "Текущий пакет правок пуст. Невозможно загрузить данные." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10336,5 +10385,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10361,5 +10410,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10367,5 +10416,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10378,5 +10427,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10541,5 +10590,5 @@ msgstr "Файл \"{0}\" не существует" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10550,19 +10599,19 @@ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "Найден элемент XML , не являющийся дочерним элементом для ." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Отсутствует обязательный атрибут ''{0}'' на линии {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Неверное значение атрибута ''ref'' элемента . Получено {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" @@ -10570,10 +10619,10 @@ "." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Отсутствует атрибут ''ref'' у участника отношений {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" @@ -10581,10 +10630,10 @@ "Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Отсутствует атрибут ''type'' у участника {0} отношения {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10594,9 +10643,9 @@ "{2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Неполная спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." @@ -10604,10 +10653,10 @@ "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Недопустимый объект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10619,10 +10668,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10634,25 +10681,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Неизвестная или неподдерживаемая версия API. Получено {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Отсутствует атрибут ''version'' на элементе OSM с ID {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Отсутствует нужный атрибут ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "Неверная длина значения атрибута ''{0}''. Получено ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -11140,5 +11187,5 @@ msgstr "(Текст уже скопирован в буфер обмена)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -11149,15 +11196,5 @@ "адрес сервера в настройках и соединение с интернет." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" -"Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''." -"
Пакет правок будет автоматически закрыт сервером по истечении времени " -"ожидания." - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -11170,5 +11207,5 @@ "удалите ссылку на отношение {0}, затем снова загрузите на сервер." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -11181,10 +11218,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''." - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -11195,5 +11227,5 @@ "он уже был закрыт." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -11204,5 +11236,5 @@ "он уже был закрыт в {1}." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -11213,9 +11245,18 @@ "(англ.):
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "Сервер сообщил, что обнаружен конфликт." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, fuzzy, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" +"Закрытие пакета правок {0} не удалось
, потому что " +"он уже был закрыт в {1}." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -11228,5 +11269,5 @@ "формы приложения ''{1}''." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -11237,5 +11278,5 @@ "
Пожалуйста проверьте свое подключение к интернету." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -11246,5 +11287,5 @@ "проблемы передачи данных.
Подробнее: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -11255,10 +11296,10 @@ "временная проблема. Пожалуйста, попробуйте позднее." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "Сервер OSM ''{0}'' сообщил о неудачном запросе.
" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -11270,10 +11311,10 @@ "средствами экспорта файлов OSM." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "
Сообщение об ошибке (на английском): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -11288,5 +11329,5 @@ "Пожалуйста, внимательно проверьте адрес сервера ''{0}'' на предмет опечаток." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -11299,5 +11340,5 @@ "программы и ваше соединение с интернет." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -12061,5 +12102,5 @@ msgstr "Ошибка в файле {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -12075,29 +12116,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "Выбрать Feuille (слой??)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Ошибка при загрузке файла" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambert зона 1 кэш файл (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert зона 1 кэш файл (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambert зона 21 кэш файл (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambert зона 3 кэш файл (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert зона 4 кэш файл (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -12128,13 +12189,13 @@ msgstr "Выбрать из..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Кадастр" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Авто источники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -12146,13 +12207,13 @@ "Вы хотите назначить на клавишу F11 функцию захвата?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "Восстановить действие захватывающей клавиши F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM остановлено для того, чтобы проявились изменения." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12460,43 +12521,48 @@ msgstr "Установить {0} Lambert координаты" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "Задать вручную Lambert zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Зона" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Зона Ламберта" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Загрузка расположения из кэша (только если кэш включен)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "{0} не позволено в текущей проекции" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Изменить расположение" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Установить новое место для следующего запроса" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Добавить новый слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Расположение" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12506,5 +12572,5 @@ "пунктуацию опубликованную www.cadastre.gouv.fr " -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Добавить новый слой" @@ -12536,5 +12602,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Подстроить WMS" @@ -12566,5 +12632,5 @@ "Выберите сначала один из них, а затем повторите" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12572,28 +12638,28 @@ msgstr "Пустой слой" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "слой WMS ({0}), квадратов загружено: {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Не векторизованны." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "Размер растра: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Векторизован." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "общий квадрат: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12604,29 +12670,16 @@ "Создайте новый файл." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Ошибка формата кеша" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Ошибка кеширования зоны Ламберта" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" -"Текущий слой в Lambert CC9 Zone это \"{0}\"\n" -"где коммуна в Lambert CC9 Zone это \"{1}\".\n" -"Загрузите на сервер изменения, закройте все слои\n" -"и измените вручную Lambert zone в меню Кадастр" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13691,20 +13744,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Разрешить действие?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Подтверждение действия дистанционного управления" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "Пультом управления было предложено создать новую точку." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13828,13 +13881,9 @@ msgstr "Отдалить" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "Привязаться к размеру квадрата" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Очистить кеш квадрата карты" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "изображение " @@ -14426,5 +14475,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +#, fuzzy +msgid "Unconnected coastline" msgstr "Неприсоединённая береговая линия" @@ -15091,12 +15141,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Скачать" +msgstr "Скачать линию" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Скачать картографические данные с сервера OSM." +msgstr "Скачать данные карты, лежащие на конце выбранной линии" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -15110,11 +15158,10 @@ msgid "Could not find a unique node to start downloading from." msgstr "" +"Не удалось найти уникальную точку, чтобы начать с неё загрузку." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." -msgstr "" -"Нет слоёв, с которым исходный слой
''{0}''
может быть объединён." -"" +msgstr "Нет линий, присоединённых к точке ''{0}''. Отменено." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -15124,4 +15171,6 @@ "discovered after download" msgstr "" +"Данные модуля скачивания линии неполные. Ранее присоединённая линия ''{0}'' " +"не была обнаружена после скачивания с сервера" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182 @@ -15136,18 +15185,15 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Удаление повторяющихся точек..." +msgstr "Объединить дубликаты точек?" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 -#, fuzzy msgid "No more connected ways to download." -msgstr "" -"В настоящий момент не выбрана область для скачивания с сервера." +msgstr "Нет больше присоединённых линий для скачивания с сервера." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221 #, java-format msgid "Node ''{0}'' is a junction with more than 2 connected ways." -msgstr "" +msgstr "Точка ''{0}'' это соединение более, чем 2 пересекающихся линий." #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71 @@ -15208,29 +15254,29 @@ msgstr "Нет верных WMS URL или ID" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Отрегулируйте положение выбранного слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Пожалуйста, выберите слой WMS для выравнивания" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Выбрать слой WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Начало выравнивания" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "Нет слоя WMS для выравнивания." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "Нет слоёв для выравнивания" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -15241,5 +15287,5 @@ "знак '&' или '?'." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -15249,10 +15295,10 @@ "Пожалуйста, проверьте настройки параметров." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "Предупреждение: Полная ссылка: ''{0}''." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -15267,5 +15313,5 @@ msgstr "Автоматическое скачивание" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -15274,19 +15320,19 @@ "искажена" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(деактивировано)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -15301,13 +15347,13 @@ "попытаться извлечь квадраты WMS?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Да, выбрать изображения" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "Ошибочная ссылка?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -15316,37 +15362,37 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Скачать видимые квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Перезагрузить ошибочные квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Сохраниеть WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -15354,7 +15400,12 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Ошибка формата файла" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Создать закладку" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27719,8 +27770,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "необычная комбинация тегов" @@ -27740,34 +27790,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "карты NPE" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Карты (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27777,9 +27816,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Улицы NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27793,102 +27835,165 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Поиск невозможен, так как не загружено никаких данных." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "В этой истории не существует элемента версии {0}" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "более ранняя версия не найдена. История пуста." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "более поздняя версия не найдена. История пуста." - -#~ msgid "No type found. History is empty." -#~ msgstr "Тип не найден. История пуста." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Элемент с id {0} не был найден в этом наборе данных" - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных" - -#~ msgid "Select a starting node on the end of a way" -#~ msgstr "Выделите начальную точку на конце линии" - -#~ msgid "Reached the end of the line" -#~ msgstr "Достигнут конец линии" - -#~ msgid "Reached a junction" -#~ msgstr "Достигнут перекрёсток" - -#~ msgid "help" -#~ msgstr "Справка" - -#~ msgid "Help / About" -#~ msgstr "Справка / О модуле" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "карты NPE" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Карты (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambert зона 21 кэш файл (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambert зона 3 кэш файл (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambert зона 4 кэш файл (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambert зона 21 кэш файл (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambert зона 3 кэш файл (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambert зона 4 кэш файл (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambert зона 1 кэш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambert зона 1 кэш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambert зона 1 кэш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambert зона 1 кэш файл (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambert зона 1 кэш файл (.1)" + +#~ msgid "null detected in node list" +#~ msgstr "обнаружено значение null в списке точек" + +#~ msgid "unexpected null value for n.getEastNorth(). id of n is" +#~ msgstr "неожиданное значение null для n.getEastNorth(). id из n" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " -#~ "- these will then show up in the WMS menu.\n" -#~ "\n" -#~ "You can also do this manually in the Advanced Preferences, using the " -#~ "following schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " -#~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " -#~ "in this example, replacing 73 with your image id:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " -#~ "use." +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." #~ msgstr "" -#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке " -#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n" -#~ "\n" -#~ "Также можно сделать это вручную в \"Расширенных настройках\", используя " -#~ "следующую схему:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... и так далее\n" -#~ "\n" -#~ "Пример входного формата: полный URL WMS (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , " -#~ "всё что нужно - ввести соответствующий 'id'.\n" -#~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в " -#~ "приведённом примере, заменив 73 на id вашего изображения:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Примечание: Убедитесь что использование изображения легально, если в этом " -#~ "есть хоть какие-то сомнения - не используйте его." - -#~ msgid "WMS Plugin Help" -#~ msgstr "Справка по модулю WMS" +#~ "ВАЖНО : данные расположены слишком\n" +#~ "далеко от текущих границ Lambert зоны.\n" +#~ "Не загружайте пока никаких данных .\n" +#~ "Отмените последнее действие, сохраните\n" +#~ "данные и начните новый слой в новой зоне." + +#~ msgid "Edit Properties" +#~ msgstr "Изменить параметры" + +#~ msgid "Linked" +#~ msgstr "Связанные" + +#~ msgid "" +#~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +#~ "changeset will automatically be closed by the server after a timeout." +#~ msgstr "" +#~ "Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''." +#~ "
Пакет правок будет автоматически закрыт сервером по истечении времени " +#~ "ожидания." + +#~ msgid "Set manually the Lambert zone" +#~ msgstr "Задать вручную Lambert zone" + +#~ msgid "Zone" +#~ msgstr "Зона" + +#~ msgid "" +#~ "Current layer is in Lambert CC9 Zone \"{0}\"\n" +#~ "where the commune is in Lambert CC9 Zone \"{1}\".\n" +#~ "Upload your changes, close all layers and change\n" +#~ "manually the Lambert zone from the Cadastre menu" +#~ msgstr "" +#~ "Текущий слой в Lambert CC9 Zone это \"{0}\"\n" +#~ "где коммуна в Lambert CC9 Zone это \"{1}\".\n" +#~ "Загрузите на сервер изменения, закройте все слои\n" +#~ "и измените вручную Lambert zone в меню Кадастр" + +#~ msgid "Snap to tile size" +#~ msgstr "Привязаться к размеру квадрата" #~ msgid "No data imported." @@ -28108,4 +28213,10 @@ #~ msgid "Adjust the position of the WMS layer" #~ msgstr "Подстроить положение слоя WMS" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Справка по модулю WMS" + +#~ msgid "Help / About" +#~ msgstr "Справка / О модуле" #~ msgid "Navigation" @@ -28645,4 +28756,10 @@ #~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее." +#~ msgid "Reached the end of the line" +#~ msgstr "Достигнут конец линии" + +#~ msgid "Reached a junction" +#~ msgstr "Достигнут перекрёсток" + #~ msgid "removing reference from way {0}" #~ msgstr "удаление ссылки из линии {0}" @@ -28751,4 +28868,7 @@ #~ "его после загрузки" +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Поиск невозможен, так как не загружено никаких данных." + #~ msgid "Use the existing changeset {0} and close it after upload" #~ msgstr "" @@ -28809,4 +28929,10 @@ #~ msgid "Purging 1 primitive" #~ msgstr "Очистка 1 элемента" + +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных" + +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Элемент с id {0} не был найден в этом наборе данных" #~ msgid "Primitive already deleted" @@ -28834,4 +28960,7 @@ #~ "ошибке:
{0}" +#~ msgid "Select a starting node on the end of a way" +#~ msgstr "Выделите начальную точку на конце линии" + #~ msgid "Only two nodes allowed" #~ msgstr "Можно только две точки" @@ -28847,4 +28976,13 @@ #~ msgid "Unexpected return value. Got {0}." #~ msgstr "неожиданное возвращённое значение. Получено {0}" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "более ранняя версия не найдена. История пуста." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "более поздняя версия не найдена. История пуста." #~ msgid "Index out of bounds. Got {0}." @@ -28867,6 +29005,56 @@ #~ msgstr "Показать историю выделенного элемента" +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "В этой истории не существует элемента версии {0}" + #~ msgid "MIddle way: {0}" #~ msgstr "Середина линии: {0}" + +#~ msgid "" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" +#~ "\n" +#~ "You can also do this manually in the Advanced Preferences, using the " +#~ "following schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Full WMS URL input format example (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " +#~ "only need to input the relevant 'id'.\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " +#~ "use." +#~ msgstr "" +#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке " +#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n" +#~ "\n" +#~ "Также можно сделать это вручную в \"Расширенных настройках\", используя " +#~ "следующую схему:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... и так далее\n" +#~ "\n" +#~ "Пример входного формата: полный URL WMS (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , " +#~ "всё что нужно - ввести соответствующий 'id'.\n" +#~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в " +#~ "приведённом примере, заменив 73 на id вашего изображения:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Примечание: Убедитесь что использование изображения легально, если в этом " +#~ "есть хоть какие-то сомнения - не используйте его." #~ msgid "Show Tile Status" @@ -28938,4 +29126,10 @@ #~ msgstr "Обновить выделенные элементы с сервера" +#~ msgid "help" +#~ msgstr "Справка" + +#~ msgid "No type found. History is empty." +#~ msgstr "Тип не найден. История пуста." + #~ msgid "longitude" #~ msgstr "долгота" Index: applications/editors/josm/i18n/po/sk.po =================================================================== --- applications/editors/josm/i18n/po/sk.po (revision 18772) +++ applications/editors/josm/i18n/po/sk.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-15 18:43+0000\n" -"Last-Translator: Vlado \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-22 22:09+0000\n" +"Last-Translator: marin \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:08+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Nápoveda" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorujem nesprávnu URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Upozornenie" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorujem poškodený súbor z URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Nemôžem čítať súbor ''{0}''.
Chyba je:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Nemôžem čítať súbor ''{0}''.
Chyba je:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Chyba" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -309,5 +310,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -316,27 +317,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -354,5 +355,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Zrušiť" @@ -362,19 +363,19 @@ msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Prosím vyberte cieľovú vrstvu." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Výber cieľovej vrstvy" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Zlúčiť" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -385,5 +386,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Žiadne cieľové vrstvy" @@ -496,13 +497,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -600,20 +601,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Súbor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Niesú tam otvorené súbory zmien" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Neotvorené súbory zmien" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -651,10 +652,10 @@ msgstr "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Spojiť {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Prosím, vyberte aspoň dve cesty pre spojenie." @@ -700,10 +701,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -722,11 +723,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Prepísať" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Súbor už existuje. Prepísať?" @@ -773,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -780,6 +781,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -795,7 +796,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -823,5 +823,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplikovať" @@ -845,30 +845,30 @@ msgstr "Ukončť program." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Všetky formáty" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportovať do GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportovať dáta do GPX súboru." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Nie je nič na exportovanie. Najskôr stiahnite dáta." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -876,13 +876,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -901,8 +901,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -910,7 +910,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -933,9 +933,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -947,5 +947,5 @@ msgstr "parameter ''{0}'' nesmie byť nulový" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -953,5 +953,5 @@ msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Export GPX súboru" @@ -1019,5 +1019,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 msgid "Click to abort merging nodes" -msgstr "Kľuknúť pre zrušenie spojovania bodov" +msgstr "Kliknúť pre zrušenie spojovania bodov" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 @@ -1097,6 +1097,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nový" @@ -1231,5 +1231,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Vložiť" @@ -1319,11 +1319,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Uložiť" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Uložiť aktuálne dáta." @@ -1380,10 +1380,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Uložiť ako..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Uložiť aktuálne údaje do nového súboru." @@ -1402,10 +1402,10 @@ "neúplné objekty." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Zobraziť správu o stave" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" @@ -1413,20 +1413,20 @@ "chybám" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Pomoc: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Správa o stave" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopírovať do schránky a zavrieť" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1602,5 +1602,5 @@ msgstr "Nepripojený bod (Unglued Node)" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1608,5 +1608,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1653,55 +1653,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "Sťahujem dáta" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Nájdená neaktuálna dátová sada" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "Nemôže byť nájdený objekt s id {0} v aktuálnej dátovej sade" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Aktualizovať výbery" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "Aktualizovať výber" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "Aktualizovať aktuálne vybraté objekty zo servera (znovu nahrať dáta)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Aktualizácia výberu" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "Pre aktualizáciu neboli vybrané žiadne objekty." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Výber je prázdny" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Zmazať objekty" - +msgstr "Aktualizovať objekty" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "Nahrať dáta" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "Nahrať všetky zmeny v aktívnej dátovej vrstve na OSM server" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1712,5 +1709,5 @@ "vyriešte." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1718,29 +1715,29 @@ msgstr "Žiadne zmeny pre uloženie." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "Synchronizovať iba {0} bod" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "Synchronizovať iba {0} cestu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "Synchronizovať iba {0} reláciu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synchronizovať celú dátovú sadu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1761,11 +1758,11 @@ "zrušenie a pokračovanie v editácii.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "Objavené konflikty" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1780,5 +1777,5 @@ "{1} pre zrušenie a pokračovanie v editácii.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1791,22 +1788,22 @@ "existujúcim zmenovým súborom." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "Zmenový súbor zavretý" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "Pripravujem rozhodnutie konfliktov" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" -msgstr "Kľuknutím stiahnete všetky rodičovské cesty pre body {0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +msgstr "Kliknutím stiahnete všetky rodičovské cesty pre body {0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" -msgstr "Kľuknutím zrušíte a pokračujete v editovaní mapy" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +msgstr "Kliknutím zrušíte a pokračujete v editovaní mapy" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1817,15 +1814,15 @@ msgstr "" "Nahrávanie neúspešné pretože sa snažíte zmazať bod " -"{0} ktorý je stále použitý v ceste {1}.

Kľuk {2} pre " +"{0} ktorý je stále použitý v ceste {1}.

Klik {2} pre " "stiahnutie všetky rodičovské cesty pre bod {0}.
Ak nevyhnutne JOSM bude " "chcieť vytvoriť konflikty ktoré môžete rozhodnúť v the Conflict Resolution " "Dialog." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "Bod je stále v užívaní" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" @@ -1833,9 +1830,9 @@ "Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Aktualizácia pôvodných" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1844,5 +1841,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1853,15 +1850,15 @@ "objekt a opakujem nahrávanie." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "Nahrávam {0} objekty(ov) ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1974,17 +1971,17 @@ msgstr "Spomalené prehrávanie" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Sťahujem GPS dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Stiahnuté GPX dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Sťahujem dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1992,5 +1989,5 @@ msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "V tejto oblasti sa nenachádzajú žiadne dáta." @@ -2014,5 +2011,5 @@ "server" msgstr "" -"Kľuknúť pre kontrolu či objekty vo vašej lokálnej dátovej sade sú zmazané na " +"Kliknúť pre kontrolu či objekty vo vašej lokálnej dátovej sade sú zmazané na " "servery" @@ -2024,5 +2021,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165 msgid "Click to abort and to resume editing" -msgstr "Kľuknúť pre zrušenie a obnovenie editovania" +msgstr "Kliknúť pre zrušenie a obnovenie editovania" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170 @@ -2051,9 +2048,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Chyby v priebehu sťahovania" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "Chyby počas sťahovania" @@ -2071,5 +2068,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2077,10 +2074,10 @@ msgstr "Režim: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " "when deleting a way. Ctrl: delete referring objects." msgstr "" -"Kľuknite pre zmazanie. Shift: zmaže segment cesty. Alt: zmaže cestu, ale " +"Kliknite pre zmazanie. Shift: zmaže segment cesty. Alt: zmaže cestu, ale " "nemaže body. CTRL: zmaže referenčné objekty." @@ -2173,8 +2170,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "" -"Nakreslite obdĺžnik požadovanej veľkosti a potom pustite tlačítko myši." +msgstr "Posuň segment pozdĺž jeho normály, potom pusť tlačítko na myši." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2184,9 +2179,10 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Ťahajte segment cesty na vytvorenie pravouholníka." +msgstr "" +"Ťahať diel cesty, pre vytvorenie obdĺžniku. Ctrl+ťahať, pre posunutie dielu " +"pozdĺž jeho normály." #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2200,5 +2196,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2219,17 +2215,17 @@ msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Posunúť elementy" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Posunúť ich(them)" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Krok späť posun" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2241,13 +2237,13 @@ "Skutočne ich chcete presunúť?" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "Vždy posúvať a nezobrazovať znovu dialóg" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2255,9 +2251,9 @@ "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Pustite tlačítko myši k zastaveniu otáčania" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2267,15 +2263,15 @@ "Ctrl na otáčanie výberu; alebo zmenu výberu" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zväčšenie" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Priblížiť/Vzdialiť a pohyb mapy" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2285,10 +2281,10 @@ "hore dolu doľava doprava; pohyb so zväčšením možno tiež pravým tlačítkom myši" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Vyhľadávať..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2297,60 +2293,59 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "Prosím vložte vybraný reťazec" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Zadajte hladaný reťazec." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regulárny výraz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "Vložte hľadaný výraz" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "nahradiť označené" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "pridať k výberu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "odobrať z výberu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "Hľadať vo výbere" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "veľkosť písmen rozhoduje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regulárny výraz" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Baker Street - 'Baker' a 'Street' v akomkoľvek kľúči, alebo mene." + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' a 'Street' v akomkoľvek kľúči, alebo mene." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"Baker Street\" - 'Baker Street' v akomkoľvek kľúči, alebo mene." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' v akomkoľvek kľúči, alebo mene." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' kdekoľvek v mene." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=cesta - kľúč 'type' s presnou hodnotou 'cesta'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2360,17 +2355,17 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - neobsahuje 'Bak' v mene." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - klúč 'foot' nastavený na akúkoľvek hodnotu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Špeciálne ciele:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" @@ -2379,17 +2374,17 @@ "b>)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - všetky objekty nahraté užívateľom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt s určeným ID (0 pre nové objekty)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt s pridanými číslami bodov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2399,44 +2394,44 @@ "alebo značky:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - všetky zmenené objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - všetky vybraté objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - všetky nekompletné objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "untagged - všetky neoznačené objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" msgstr "dieťa výraz - všetky deti objektov vyhovujúcich výrazu" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"rodič výraz - všetci rodičia objektov vyhovujúcich výrazu" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"rodič výraz - všetci rodičia objektov vyhovujúcich výrazu" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "Použite | alebo OR pri kombinácii s logickým \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Použite \" ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Použite ( a ) k zoskupeniu výrazov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2446,51 +2441,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Hľadať" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "Predložiť filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Začať vyhľadávanie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Neboli nájdené záznamy pre \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Najdených {0} zodpovedajúcich výrazov" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2507,5 +2502,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2513,10 +2508,10 @@ "použitia: kľúč=hodnota" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2524,26 +2519,26 @@ "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "Neočakávaná značka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Chýbajúci argument pre \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Chýbajúci argument pre \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Očakávam uzatváraciu zátvorku." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "Zlý počet údajov(parametrov) pre operátor značiek." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2554,9 +2549,9 @@ "zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Zlé číslo parametrov pre operátor bodov." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2567,5 +2562,5 @@ "alebo rozsah bodov, napr. body:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2672,7 +2667,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2785,5 +2780,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "Dvojitý konflikt" @@ -2812,5 +2807,5 @@ "prítomná." -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2818,6 +2813,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "nemôžem vyriešiť nerozhodnutý konflikt" @@ -2832,8 +2827,10 @@ msgid "At least one object to delete required, got empty collection" msgstr "" +"Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden objekt" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106 msgid "At least one object to delete requird, got empty collection" msgstr "" +"Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden objekt" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 @@ -2891,18 +2888,8 @@ msgstr "Odstrániť potvrdenie" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "Vyriešte konflikty v zmazaných (state) v {0}" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2938,10 +2925,10 @@ msgstr "Vybranie odkazu z relácie {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "Rozhodnutie konfliktov v member list of relation {0}" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2975,20 +2962,20 @@ msgstr "Sekvencia" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "Vyriešiť {0} konfliktné značky v bode {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "Vyriešiť {0} konfliktné značky v ceste {1}" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "Vyriešiť {0} konfliktné značky v relácii {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -3010,10 +2997,10 @@ msgstr "Vyriešiť konflikty verzie pre reláciu {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Vyriešte konflikty v zozname bodov cesty {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3057,5 +3044,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nová hodnota" @@ -3102,7 +3089,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "parameter {0} > 0 požadovaný. Dostal {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3111,10 +3098,10 @@ msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Poškodený konfiguračný súbor pri linke {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3125,5 +3112,5 @@ "nie je adresár." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3134,5 +3121,5 @@ "nie je adresár." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3143,5 +3130,5 @@ "chýbajúceho adresára preferencií: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3152,5 +3139,5 @@ "chýbajúceho adresára preferencií: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3160,5 +3147,5 @@ "súboru preferencií." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3169,5 +3156,5 @@ "súborom preferencií." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3178,5 +3165,5 @@ "preferencií do východzieho: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3187,5 +3174,5 @@ "súboru
{0}
a vytváranie nového východzieho súboru." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3196,10 +3183,10 @@ "preferencií do východzích: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3288,25 +3275,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3314,5 +3301,5 @@ msgstr "Súbor zmien {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3320,5 +3307,5 @@ msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3328,34 +3315,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +msgstr "Chýba zlúčujúci ciel pre objekt s id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Chýbajúci argument pre \"NOT\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "Chýba zlúčujúci ciel pre bod s id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "História pre reláciu {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "Chýba zlúčujúci ciel pre reláciu s id {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" +msgstr "Chýba zlúčujúci ciel typu {0} s id {1}" #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3363,7 +3350,4 @@ "Keeping target object. " msgstr "" -"Moje pôvodné s id {0} a verziou {1} sú viditeľné pretože ich pôvodné sú v " -"nižšej verzii {2} nie sú viditeľné. Nenastala dohoda s touto nezrovnalosťou. " -"Zostávajú moje pôvodné. " #. translators notes must be in front @@ -3420,24 +3404,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "očekávané id >= 0. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "pôvodné s id=0 nemôžu byť neviditeľné" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID > 0 očakávané. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "verzia > 0 očakávaná. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3445,5 +3429,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3473,10 +3457,10 @@ "viacnásobnými hodnotami" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3487,7 +3471,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "parameter {0} > 0 požadovaný. Dostal {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3506,7 +3490,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3641,10 +3625,10 @@ msgstr "oblasť textu" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3656,6 +3640,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3666,5 +3650,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3675,6 +3659,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3693,6 +3677,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "pozadie" @@ -3710,24 +3694,36 @@ msgstr "Gauss-Laborde Réunion 1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"Dôležité : súradnice v dátach sú ďaleko od\n" -"hranice Lambertovej zóny.\n" -"Nenahrávajte žiadne dáta po zobrazení tejto hlášky!\n" -"Urobte spätný krok (undo), uložte vašu prácu\n" -"a začnite v novej vrstve a v novej zóne." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "Lambert 4 Zones (Francúzko)" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambert zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "Lambert CC9 Zone (Francúzko)" @@ -3741,27 +3737,56 @@ msgstr "Mercatorova projekcia" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "UTM Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "Swiss Grid (Švajčiarsko)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "UTM" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "UTM Zone" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N Guadeloupe Fort-Marigot 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N Martinique Fort Desaix 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3775,10 +3800,10 @@ msgstr "Nemôžem zapísať záložku.
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Nezobrazovať v budúcnosti" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3786,32 +3811,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "neúplný" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "komunikácie" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "železnica" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vodný tok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "využitie oblasti (landuse)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3821,5 +3846,5 @@ msgstr[2] "{0} bodov" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3858,6 +3883,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Konflikt" @@ -3867,11 +3892,11 @@ msgstr "Neznámy hostiteľ" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "Objekt je vymazaný" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3888,5 +3913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82 msgid "Click to close the dialog" -msgstr "Kľuknutím zavriete dialóg" +msgstr "Kliknutím zavriete dialóg" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 @@ -4080,11 +4105,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4199,5 +4224,5 @@ msgstr "Dĺžka nového nakresleného segmentu trasy bude zobrazená." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4207,18 +4232,18 @@ "výber priamo z tohoto zoznamu s myšou.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(žiadny objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "Používateľ:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "vrstva nie je v zozname" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4227,5 +4252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50 msgid "Click to cancel the current operation" -msgstr "Kľuknutím zrušíte aktuálnu operáciu" +msgstr "Kliknutím zrušíte aktuálnu operáciu" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -4314,9 +4339,9 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327 msgid "Click to close the dialog and remove the object from the relations" -msgstr "Kľuknutie zavrie dialóg a odstráni objekt z relácií" +msgstr "Kliknutie zavrie dialóg a odstráni objekt z relácií" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340 msgid "Click to close the dialog and to abort deleting the objects" -msgstr "Kľuknutie zavrie dialóg a zruší vymazanie objektov" +msgstr "Kliknutie zavrie dialóg a zruší vymazanie objektov" #. * @@ -4346,50 +4371,50 @@ msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Členovia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "Nevyriešený konflikt značiek musí byť vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "Značky({0} konfliktov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} nevyriešený konflikt značiek musí byť vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "Body(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4398,17 +4423,17 @@ "tejto ceste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "Body(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "Členy(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4418,68 +4443,68 @@ "tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "Členy(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyriešené konflikty v zozname členov v tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "Nevyriešený konflikt vo vlastnostiech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konfliktmi)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "Nebyriešený konflikty vlastností musia byť vyriešené" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Rozhodnutie konfliktov" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "aktuálny parameter je mimo rozsahu: got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "neočakávaná hodnota parametra\"index\". Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "položka {0} sa v zozname nenachádza" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "zablokovať rolovanie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "Porovnať " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "Moja verzia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "Zoznam elementov v mojej dátovej sade, i.e. miestna dátová sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4487,5 +4512,5 @@ msgstr "Spojovaná verzia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4495,31 +4520,31 @@ "rozhodnutie pre spojenie bude aplikované" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "Ich verzia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "Zoznam elementov v ich dátovej sade, i.e. v dátovej sade servera" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> hore" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "Kopírovať moje vybrané body na začiatok zoznamu pre spojované body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> dole" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" "Kopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4529,5 +4554,5 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4537,5 +4562,5 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." @@ -4543,10 +4568,10 @@ "Kopírovať ich vybrané elementy na začiatok zoznamu pre spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4556,5 +4581,5 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4564,54 +4589,54 @@ "spojované elementy" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Hore" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Dole" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Odstrániť" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Blokovať" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "Blokovať aktuálny zoznam spojovaných elementov" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Odblokovať" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4622,5 +4647,5 @@ "položiek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4631,5 +4656,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4639,5 +4664,5 @@ msgstr[2] "Moja verzia ({0} vstupov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4647,5 +4672,5 @@ msgstr[2] "Spojovaná verzia ({0} vstupov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4655,6 +4680,6 @@ msgstr[2] "Ich verzia ({0} vstupov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4665,6 +4690,6 @@ "nastavení synchronizácie." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4675,5 +4700,5 @@ msgstr "Bod" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel" @@ -4685,5 +4710,5 @@ msgstr "neočakávaný index stĺpca. Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4693,19 +4718,19 @@ "Nastala chyba počas komunikácie so serverom
Detaily: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "Spojenie so serverom zlyhalo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Áno, obnoviť ich tiež" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Nie, zrušiť operáciu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4716,9 +4741,9 @@ "servery.

Chcete obnoviť tieto body tiež?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Obnoviť pridané body?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4730,5 +4755,5 @@ "servery.

Chcete ich obnoviť tiež?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "Obnoviť pôvodné závislé odkazy?" @@ -4754,84 +4779,84 @@ msgstr "Súradnice:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "Vymazaný stav:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "Viditeľný Stav:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(žiadny)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "zmazané" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "nevymazaný" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "viditeľné (na servery)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "neviditeľné (na servery)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "Zostáva klon lokálnej verzie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "Fyzicky vymazať z lokálnej verzie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "Ponechaj moje súradnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "Ponechaj ich súradnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "Nerozhodnuté konflikty medzi rôznymi súradnicami" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "Udržať môj vymazaný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "Udržať ich vymazaný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "Nevyriešené konflikty medzi vymazávaným stavom" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "Zostáva môj viditeľný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "Áno, vynulovať id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "Nie, zrušiť" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4844,17 +4869,17 @@ "
Súhlasíte?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "Nastaviť id na 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "Ponechať svoj viditeľný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "Áno, očistiť to" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4865,9 +4890,9 @@ "
Súhlasíte?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "Odstrániť z dátovej sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom" @@ -4883,19 +4908,19 @@ "spojované body ešte nie sú blokované. Memôžem spustiť vykonávací príkaz" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4911,10 +4936,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4924,10 +4949,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4954,27 +4979,27 @@ msgstr "Ich(their) verzia (serverová dátová sada)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Držať vybrané páry kľúče/hodnoty z miestnej(local) dátovej sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Držať vybrané páry kľúče/hodnoty z dátovej sady servera" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "Nerozhodnuté" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "Symbol vybraných značiek je nerozhodnutý" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4999,22 +5024,22 @@ msgstr "Žiadne konflikty na rozhodnutie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Zrušiť rozhodnutie konfliktu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Použiť vyriešený konflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "Použiť" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -5022,5 +5047,5 @@ msgstr "žiadny" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5113,6 +5138,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5124,5 +5149,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5137,21 +5162,21 @@ msgstr "pozícia {0} je mimo rozsah. aktuálne číslo z členov: {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "Odstrániť tohoto člena relácie z relácie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 msgid "Keep" msgstr "Ponechať" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 msgid "Keep this relation member for the target object" msgstr "Ponechať tohto člena relácie pre cieľový objekt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "Nerozhodnutý" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "Ešte nerozhodnuté" @@ -5159,5 +5184,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "Funkcia:" @@ -5250,10 +5275,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5273,13 +5298,13 @@ msgstr "Príkazový Stĺpik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "Vyriešiť konflikty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Vyriešiť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5287,5 +5312,5 @@ "v obsahu na vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5296,25 +5321,25 @@ "vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "Zrušiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "Použiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "Použiť rozhodnutie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "Zavrieť akúkoľvek cestu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "Pokračovanie rozhodnutia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5331,13 +5356,13 @@ "{1} to return to resolving conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "Konflikt nie je úplne vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "Rozhodnutie konfliktov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5349,8 +5374,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5417,5 +5442,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5447,34 +5472,34 @@ msgstr "Otvoriť zoznam všetkých nahratých vrstiev." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Odstrániť vybranú vrstvu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Zobraziť/Skryť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Prepnúť viditeľnosť zvolenej vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "Aktivovať" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "Aktivovať vybratú vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "Spojiť túto vrstvu do ďalšej vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Presunúť zvolenú vrstvu o riadok hore." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Presunúť zvolenú vrstvu o riadok dole." @@ -5484,19 +5509,17 @@ msgstr "Informácie o vrstve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Toto zmení až {0} objektov." -msgstr[1] "Toto zmení až {0} objekt." -msgstr[2] "Toto zmení až {0} objekty." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Prázdna hodnota zmaže klúče" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "Prázdna hodnota vymaže tag." + +#: ../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 @@ -5505,10 +5528,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Zmeniť hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5518,5 +5541,5 @@ msgstr[2] "Zmeniť vlastnosti až {0} objektov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5526,9 +5549,9 @@ msgstr[2] "Toto zmení až {0} objekty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Vyberte prosím kľúč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" @@ -5552,102 +5575,98 @@ msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Pridať vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Vlastnosti: {0} / Memberships: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Vlastnosti / Memberships" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Zmeniť reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Zmazať z relácie (zo vzťahu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Naozaj zmazať výber z relacie {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Zmaže zvolený klúč vo všetkých objektoch" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Zmazať vlastnosti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Upraviť vlastnosti" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Vlastnosti: {0} / Memberships: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Vlastnosti / Memberships" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Zmeniť reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Zmazať z relácie (zo vzťahu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Naozaj zmazať výber z relacie {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Zmaže zvolený klúč vo všetkých objektoch" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Zmazať vlastnosti" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Otvoríť zoznam všetkých relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relácie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Otvoriť editor pre zvolenú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Zmazať vybraté relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Vytvoriť novú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "Pridať aktuálny výber do zoznamu vybratých relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "Výber členov zo všetkých vybraných relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "Výber členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "Stiahnutie všetkých členov z vybraných relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "Stiahnuť členov" @@ -5676,5 +5695,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5686,9 +5705,9 @@ msgstr "Výber: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Uvoľniť panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5697,7 +5716,7 @@ "lište." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" -msgstr "Kľuknite pre minimalizovanie/maximalizovanie obsahu panelu" +msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 @@ -5781,12 +5800,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "Stiahnuť členov relácie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Konflikt v dátach" @@ -5805,5 +5824,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5811,5 +5830,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5817,18 +5836,18 @@ msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "Značky a Členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "Nadradené vzťahy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "Relácia dieťa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5840,14 +5859,14 @@ "chcete pokračovať s kruhovou závislosťou?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "Odstraňte ich, vyčistite reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "Ignorujte ich, nechajte reláciu tak ako je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5860,9 +5879,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "Viacnásobné členy odkazujú na rovnaké obecné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5874,5 +5893,5 @@ "odkazy a je preto znechutený.
Vynechanie relácie ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5880,5 +5899,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5886,5 +5905,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5894,5 +5913,5 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5902,20 +5921,20 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "Editor Relácií: Odstrániť Vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5925,66 +5944,66 @@ "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "Výber pôvodných pre vybraté členy relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "Triedenie členov relácie" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "Editor Relácií: Triedenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Pridať všetky zvolené objekty medzi členy" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "Editor Relácií: Posun Hore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Presunúť zvolenú vrstvu o riadok dolu." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "Editor Relácií: Posun Dole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "Odstrániť práve vybraté členy z tejto relácie" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "Editor Relácií: Odstrániť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "Vymazať práve vydanú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "Áno, vyriešiť konflikt a zavrieť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" -msgstr "Kľuknutie vytvorí konflikt a zatvorí editor tejto relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +msgstr "Kliknutie vytvorí konflikt a zatvorí editor tejto relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "Nie, pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" -msgstr "Kľuknutie navráti editor relácie a pokračuje v editovaní relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +msgstr "Kliknutie navráti editor relácie a pokračuje v editovaní relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5996,9 +6015,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "Konflikt v dátach" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -6009,41 +6028,41 @@ "rozhodnite najskôr tento konflikt, potom skúste znovu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "Použiť súčasnú aktuálizáciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "Použiť aktualizácie a zavrieť dialógové okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "Pridať prázdnu značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Stiahnuť členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "Editor Relácií: Sťahovanie Členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "Nastavenie funkcie pre vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "Použiť Funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -6056,19 +6075,26 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "Áno, Použiť to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "Nie, použite to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "Potvrdiť prázdnu funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Nahrávam reláciu {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -6078,7 +6104,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "Zväčšiť na pôvodné prvé vybraté členy odkazujúce na" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -6090,11 +6115,7 @@ msgstr "Zväčšovanie je vypnuté pretože nie je vybratý člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "Odkazovať na" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "Spojený" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6107,5 +6128,5 @@ msgstr "child.getId() >0 očakávaný. Got {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6177,9 +6198,9 @@ msgstr "Záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "Nie je vybraná oblasť pre stiahnutie." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6190,13 +6211,13 @@ "maxlon): {0}, {1}, {2}, {3}" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "Vytvoriť záložku" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "Pridať záložku pre aktuálne výbranú sťahovanú oblasť" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." @@ -6205,39 +6226,39 @@ "oblasť." +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." +msgstr "Prosím zvoľte názov pre záložku zo sťahovanej oblasti" + #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "Prosím zvoľte názov pre záložku zo sťahovanej oblasti" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "Názov miesta" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "Vymazať vybraté záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "Premenovať vybratú záložku" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min šírka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min dĺžka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max šírka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max dĺžka" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6247,52 +6268,52 @@ "oblasti)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Ohraničujúcí box" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "Reťazec ''{0}'' nie je platný, zdvojená hodnota." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "Hodnota pre zemepisnú šírku v rozsahu [-90,90] povinná." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "Hodnota pre zemepisnú dížku v rozsahu [-180,180] povinná." -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "Vložiť URL zo schránky" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Zdroje a typy dát" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "údaje OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "Výber pre stiahnutie OSM dát vo vybratej sťahovanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Nekomprimované (Raw) GPS dáta" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "Výber pre stiahnutie GPS stôp(traces) vo vybratej sťahovanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Načítať na novú vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6300,39 +6321,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Stiahnuť plochu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Stiahnuť" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "Žiadna oblasť nie je vybratá" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "" "Sťahovaná plocha je príliš veľká, server zrejme odmietne vašu požiadavku" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Sťahovaná plocha je v poriadku, veľkosť je akceptovaná serverom" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" -msgstr "Kľuknutím zavriete dialóg a prerušíte sťahovanie" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +msgstr "Kliknutím zavriete dialóg a prerušíte sťahovanie" + +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" -msgstr "Kľuknutím stiahnete aktuálne vybratú oblasť" - -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +msgstr "Kliknutím stiahnete aktuálne vybratú oblasť" + +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "Prosím vyberte najskôr sťahovanú oblasť" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6357,21 +6378,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Chyba null pointera, možno sú neprítomné značky" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "Hľadám ..." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" -msgstr "Kľuknutím sa spustí hľadanie pre miesta" - -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +msgstr "Kliknutím sa spustí hľadanie pre miesta" + +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "Pýtam sa na meno servera" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "Pýtam sa na meno servera ..." @@ -7110,8 +7131,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7284,5 +7305,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7294,5 +7315,5 @@ msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "Blízko" @@ -7342,5 +7363,5 @@ msgstr "JOSM Help Browser" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7354,5 +7375,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7363,5 +7384,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7369,20 +7390,23 @@ "network problem, please check your
your internet connection" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +"Neúspešné otvorenie stránky pomoci z url {0}.
Je to pravdepodobne " +"spôsobené problémom v sieti, prosím skontrolujte váš
vaše internetové " +"pripojenie" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "Neúspešné otvorenie URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "Otvoriť aktuálnu stránku pomoci v externom prehliadači" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "Upraviť aktuálnu stránku pomoci" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7392,32 +7416,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "Preložiť aktuálnu stránku pomoci" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "Prejsť na predchádzajúcu stránku" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "Prejsť na nasledujúcu stránku" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "Choďte na JOSM domácu stránku pomoci" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "Varovanie: zlé umiestnenie v HTML dokumente. Výnimka bola: " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 msgid "Failed to open help page. The target URL is empty." msgstr "Neúspešné otvorenie stránky s pomocou. Cieľová URL je prázdna." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 msgid "Failed to open help page" msgstr "Neúspešné otvorenie stránky s pomocou" @@ -7440,5 +7464,5 @@ msgstr "Zemepisná dĺžka: " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "Súradnice" @@ -7502,12 +7526,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parameter {0} > 0 požadovaný. Dostal {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7532,33 +7556,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "Bod {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "Priblížiť k bodu" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Priblížiť na problém" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" -msgstr "" +msgstr "Priblížiť k tomuto bodu v aktuálnej vrstve" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "Zobraz históriu" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Nahrať priebeh" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +msgstr "Otvor prehliadač histórie, s históriou tohto bodu" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "Cesta {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7567,7 +7589,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Menu Sort presets" +msgstr "nie je prítomný" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7585,7 +7606,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7613,21 +7633,21 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" +"Verzia {0} aktuálne upravovaná vo vrstve ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 +#, java-format +msgid "" +"Version {0} created on {1}" +msgstr "" "Verzia {0} vytvorená na {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 -#, java-format -msgid "" -"Version {0} created on {1}" -msgstr "" -"Verzia {0} vytvorená na {1}" - #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "" +msgstr "anonymný" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7655,17 +7675,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Verzia {0}" +msgstr "Verzia {0} v editore" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "zmazané" +msgstr "[vymazať]" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "Verzia {0} vytvorená na {1} podľa {2}" +msgstr "Verzia {0} aktuálne editovaná v dátovej vrstve ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7718,10 +7737,10 @@ msgstr "zatváranie zmenového súboru {0}" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "Vybrať meno súboru" @@ -7963,5 +7982,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7984,17 +8003,17 @@ msgstr "Vrstva" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "Mali by ste nahrávať?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "Mali by ste uložiť?" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "Meno súboru" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -8010,7 +8029,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "Značky pre nový súbor zmien" @@ -8056,29 +8075,29 @@ msgstr[2] "{0} zmazaných objektov:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Nahrať zmeny" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "Nahrať zmenené pôvodné" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "Neplatná poznámka nahrávania" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "Zrušiť nahrávanie a pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "Nahrať všetky zmeny v jednej požiadavke" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -8088,38 +8107,38 @@ "požiadavky na zmenené pôvodné" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Doplniť krátky komentár k nahrávaným zmenám" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "Otvoriť nový zmenový súbor" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "Použiť a otvoriť zmenový súbor" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "Nahrať dáta do už otvoreného zmenového súboru" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "zatvoriť zmenový súbor po nahratí" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "Vybrať na zavretie zmenový súbor po ďalšom nahratí" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -8127,16 +8146,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "Nahrať obsah z vašich otvorených zmenových súborov zo servera" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "Zatvoriť práve vybratý otvorený zmenový súbor" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8186,24 +8205,24 @@ msgstr "Pokračovať v nahrávaní" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Obrázky pre {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Čítať GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Žiadny čas pre bod {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8211,33 +8230,33 @@ msgstr "Čítam {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Nenájdené žiadne obrázky s časovými značkami." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Obrázky s GPS súradnicami" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Štart GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Koniec GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "súčastná odchylka: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "rozdiel časových pásiem: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8247,14 +8266,14 @@ msgstr[2] "obrázkov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} vo vnútry stopy (track)." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Synchronizovať hodiny" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8262,32 +8281,32 @@ msgstr "JPEG obrázky (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Dáta v súbore \"{0}\" nemohli byť parsované." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V súbore \"{0}\" nie je časová značka EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Obrázok" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synchronizovať čas s GPS zariadením" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Zadaný čas nemôže byť rozparsovaný" @@ -8377,5 +8396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8430,10 +8449,10 @@ msgstr[2] "{0} waypointov (bodov cesty)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Konvertovať do dátovej vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8443,11 +8462,11 @@ "chcete nahrať stopy (traces), pozrite sem:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8457,29 +8476,29 @@ msgstr "Prevedené z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Stiahnuť z OSM okolie tejto stopy (track)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Stiahnuť všetko vo vnútry:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metrov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Maximálna plocha na požiadavku:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} štvorcových km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8490,9 +8509,9 @@ "
Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8502,5 +8521,5 @@ "alebo za koncom, boli vynechané, alebo presunuté na začiatok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8510,23 +8529,23 @@ "ich času boli vynechané." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Údajová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "mimo ukladanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "verzia {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8536,5 +8555,5 @@ msgstr[2] "Bolo tam zistených {0} konfliktov." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8548,5 +8567,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8559,11 +8578,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" -msgstr "Kľuknutím zavriete tento dialóga pokračujete v editovaní" - -#: ../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 +msgstr "Kliknutím zavriete tento dialóga pokračujete v editovaní" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8573,22 +8592,35 @@ msgstr[2] "{0} vymazaných" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "neuršený (unset)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "Verzia API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Previesť do GPX vrstvy" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Nenajdená cesta \"from\"." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8697,9 +8729,9 @@ "posunutie." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Zobraziť/Skryť Text/Ikony" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Prepínač zobrazovania značiek textu a ikon." @@ -8765,5 +8797,5 @@ msgstr "Východzia hodnota nie je známa (ešte nebola definovaná)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8771,5 +8803,5 @@ msgstr "Prosím vyberte riadok na úpravu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8777,5 +8809,5 @@ msgstr "Nová hodnota pre {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8784,5 +8816,5 @@ msgstr "Prosím vyberte riadok na odstránenie." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Zadajte novú dvojicu klúč/hodnota" @@ -8918,40 +8950,40 @@ msgstr "Kalibrácia zvukového nahrávania" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Farba" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Farebný štýl {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Vrstva: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Vybrať" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Zvoľte farbu pre {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Zadať východzie (prednastavené)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Zadať všetko východzie (prednastavené)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Farby použité rôznymi objektami v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Farby" @@ -9397,17 +9429,17 @@ msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Zobrazovať súradnice ako" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Metóda projekcie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "Kód projekcie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "Hranice" @@ -9417,5 +9449,5 @@ msgstr "Projekcia mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9473,81 +9505,81 @@ msgstr "Skratka" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "Aktívne štýly" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "Dostupné štýly (z {0})" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "Icon paths" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "Short Description: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "Autor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "Internetová stránka: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "Verzia: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "Pridať názov súboru, alebo URL z aktívnych štýlov" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "Odstrániť vybraté štýly z obsahu aktívnych štýlov" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "Upraviť názov súboru, alebo URL pre vybraté aktívne štýly" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "Pridať vybraté aktívne štýly do obsahu aktívnych štýlov" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "Znovu načítať obsah aktívnych štýlov z ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "Pridať novú cestu pre ikony" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "Odstrániť vybraté cesty ikon" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "Upraviť vybraté cesty ikon" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "Vložiť zdroje štýlov z ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9558,6 +9590,6 @@ "(nepreložené):
{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9745,10 +9777,10 @@ msgstr "Skupiny modifikátorov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9759,13 +9791,13 @@ msgstr[2] "Odstrániť staré kľúče z {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "Pridať novú značku" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "Zmazať výber v tabuľke značiek" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9773,18 +9805,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Voliteľné atribúty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "uzavratá cesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Neznány type (druh): {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9795,15 +9827,15 @@ msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Chyba rozkladania(parsovania) {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu(druhu) {0} sú podporované." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9814,18 +9846,18 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Nevhodný výber!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Použiť predvolené" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Zmeniť vlastnosti" @@ -9841,6 +9873,6 @@ msgstr "Prednastavená skupina {0}" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9849,8 +9881,21 @@ msgstr "Pripája sa na OSM Server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Sťahujem body {0} až {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''" #. SAXException does not chain correctly @@ -9967,5 +10012,5 @@ msgstr "Neznámy mód {0}." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -9974,6 +10019,6 @@ "pôvodných" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9983,20 +10028,20 @@ msgstr "Sťahujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "Priniesť(Fetching) bod s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "Priniesť(Fetching) cestu s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "Priniesť(Fetching) reláciu s id {0} z ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -10004,20 +10049,20 @@ "Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "Priniesť(Fetching) balíček bodov z {0}" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "Priniesť(Fetching) balíček ciest z {0}" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "Priniesť(Fetching) balíček relácií z {0}" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -10086,5 +10131,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -10099,66 +10144,66 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "Vytváranie súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" -msgstr "ˇUspešne otvorený súbor zmien {0}" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +msgstr "Úspešne otvorený súbor zmien {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "Aktualizácia súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "Aktualizácia súboru zmien {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Zatváranie súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "Nenachádza sa tu súbor zmien pre diff nahratie" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Pripravujem..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Nahrávam..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "Čakanie 10 sekúnd ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Začiatok opakovania {0} z {1} v {2} sekunde ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - skúšam znovu." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "Spúšťam opakovanie {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10193,5 +10238,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10218,5 +10263,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10224,5 +10269,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10235,5 +10280,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10399,5 +10444,5 @@ msgstr "Súbor \"{0}\" neexistuje" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10408,30 +10453,30 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" "vytvoriť XML element element nie je ako priame dieťa z elementu " -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "Chýba povinná vlastnosť ''{0}'' na z cesty {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu . Got {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu " -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" @@ -10439,10 +10484,10 @@ "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10451,19 +10496,19 @@ "Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Nekompletné špecifikácie s ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10474,10 +10519,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10489,25 +10532,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "Chýba povinná vlastnosť ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10985,5 +11028,5 @@ msgstr "(Text už bol skopírovaný do schránky.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10995,15 +11038,5 @@ "pripojení." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" -"Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''." -"
The súbor zmien bude automaticky zavretý na servery po vypršaní časového " -"limitu." - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -11016,5 +11049,5 @@ "odkaz z relácie {0}, a nahrajte znovu." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -11027,10 +11060,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -11041,5 +11069,5 @@ "uzavretý." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -11050,5 +11078,5 @@ "už bol zavretý na {1}." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -11059,9 +11087,18 @@ "(nepreložená):
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "Server poslal správu, že objavil konflikt." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, fuzzy, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" +"Zatváranie zmenového súboru {0} neúspešné
pretože " +"už bol zavretý na {1}." + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -11075,5 +11112,5 @@ "applet z ''{1}''." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -11084,5 +11121,5 @@ "
Prosím, skontrolujte vaše internetové pripojenie." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -11093,5 +11130,5 @@ "problém pri prenose dát.
Detaily (nepreložené): {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -11102,10 +11139,10 @@ "veľmi pravdepodobne a dočasný problém. Prosím skúste znovu pozdejšie." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "OSM server ''{0}'' hlási zlý príkaz.
" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -11117,10 +11154,10 @@ "súbor poskytnutý OSM komunitou." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "
Chybná správa(nepreložený): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -11135,5 +11172,5 @@ "serverov ''{0}'' kvôli preklepom." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -11146,5 +11183,5 @@ "URL vo vašich nastaveniach a vaše internetové pripojenie." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11899,5 +11936,5 @@ msgstr "Chyba v súbore {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11913,29 +11950,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "Vybrať Feuille" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambert Zóna 1 cache súbor (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert Zóna 1 cache súbor (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambert Zóna 2 cache súbor (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambert Zóna 3 cache súbor (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert Zóna 4 cache súbor (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11966,13 +12023,13 @@ msgstr "Vybrať z..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Automatické získavanie" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11984,13 +12041,13 @@ "Budete si želať obnoviť F11 pre grabovanie?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "Obnoviť klávesovú skratku pre grabovanie F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12240,5 +12297,5 @@ "(two points required)" msgstr "" -"Kľukni na prvý roh pre orezanie obrázka\n" +"Kliknite na prvý roh pre orezanie obrázka\n" "(povinné sú dva body)" @@ -12250,5 +12307,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189 msgid "Click second corner for image cropping" -msgstr "Kľukni na druhý roh pre orezanie obrázka" +msgstr "Kliknite na druhý roh pre orezanie obrázka" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209 @@ -12300,43 +12357,50 @@ msgstr "Zvoliť {0} Lambert súradnice" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "Manuálne nastaviť Lambert zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zóna (oblasť)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambert zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Načítať polohu z cache (iba ak je cache zapnutá)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "{0} nepovolený s aktuálnou projekciou" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"Lambertova zóna {0} vo vyrovnávacej pamäti je nezlučiteľná s aktuálnou " +"Lambertova zónou {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Zmeniť umiestnenie" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Nastavenie nového miesta pre ďalšiu požiadavku" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Pridať novú vrstvu" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Umiestnenie" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12346,5 +12410,5 @@ "www.cadastre.gouv.fr ." -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Pridať novú vrstvu" @@ -12376,5 +12440,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Nastaviť WMS" @@ -12406,5 +12470,5 @@ "Najskôr vyberte jednu z nich a potom zopakujte" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12412,28 +12476,28 @@ msgstr "Prázdna vrstva" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS vrstva ({0}), {1} dlaždice(dlaždíc) načítané" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Nie je vektorizované." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "Veľkosť rastra: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Je vektorizované." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "Hranice obce bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12444,9 +12508,9 @@ "Vytvorte nový súbor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Cache chýb formátov" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12455,16 +12519,7 @@ "Lambertova zónou {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "Cache chýb v Lambert Zóne" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13521,20 +13576,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Chcete toto povoliť?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Potvrdiť činnosť vzdialenej kontroly" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "Vzdialená Správa s spýtala na vytvorenie nového bodu." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:" @@ -13566,13 +13621,13 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73 msgid "Click to add destination." -msgstr "Kľuknutie pridá miesto určenia." +msgstr "Kliknutie pridá miesto určenia." #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88 msgid "Click and drag to move destination" -msgstr "Kľuknutie a ťahanie posúva miesto určenia" +msgstr "Kliknutie a ťahanie posúva miesto určenia" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77 msgid "Click to remove destination" -msgstr "Kľuknutie odstráni miesto určenia" +msgstr "Kliknutie odstráni miesto určenia" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68 @@ -13656,13 +13711,9 @@ msgstr "Oddialiť" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "Flush Tile Cache" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "obrázok " @@ -14250,5 +14301,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +#, fuzzy +msgid "Unconnected coastline" msgstr "Nepripojená pobrežná čiara" @@ -14908,12 +14960,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Stiahnuť" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Stiahnutie mapových údajov z OSM servera." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14929,9 +14979,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Nie sú tam vrstvy zdrojovej vrstvy
''{0}''
nemôžu byť zlúčené." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14953,12 +15001,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Odstraňujem duplicitné body..." +msgstr "Zlúčiť duplikátne body?" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 -#, fuzzy msgid "No more connected ways to download." -msgstr "Nie je vybraná oblasť pre stiahnutie." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221 @@ -15022,29 +15068,29 @@ msgstr "Neplatná WMS URL alebo id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Nastavte polohu vybratej WMS vrstvy" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "Prosím vybrať WMS vrstvu pre nastavenie." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "Vybrať WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "Žačať nastavovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie." -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "Žiadne vrstvy na nastavovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -15055,5 +15101,5 @@ "alebo koncový '?'." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -15061,10 +15107,10 @@ msgstr "Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "Varovanie: Úplná URL je ''{0}''." -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -15080,5 +15126,5 @@ msgstr "Automatické sťahovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -15086,19 +15132,19 @@ "Varovanie: WMS vrstva je deaktivovaná, pretože je obsahuje chybnú url ''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(deaktivované)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -15113,13 +15159,13 @@ "
Chcete doniesť WMS dlaždice aj napriek tomu?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "Áno, stiahni obrázky" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "Chybná URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -15127,44 +15173,49 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "Uložiť WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Nahrať WMS vrstvu zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "Načítať WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Chyba formátu súboru" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Vytvoriť záložku" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -15358,5 +15409,5 @@ #: build/trans_plugins.java:25 msgid "Visualizes routing information as a routing graph." -msgstr "Visualizes routing information as a routing graph." +msgstr "Vizualizuje \"routing information\" ako routovací graf." #. Plugin grid @@ -15411,5 +15462,5 @@ "relation editor." msgstr "" -"Vytvorenie multipolygónov na jedno kľuknutie, o mnoho ľahšie, ako obvyklou " +"Vytvorenie multipolygónov na jedno kliknutie, o mnoho ľahšie, ako obvyklou " "cestou cez editor relácií." @@ -15422,5 +15473,5 @@ msgstr "" "Simuluje kliknutie, keď spravíte malý a krátky pohyb. Toto je užitočné pre " -"perá tabletu, keď máte problémy , stačí kľuknúť na tablet bez pohybu myši " +"perá tabletu, keď máte problémy , stačí kliknúť na tablet bez pohybu myši " "(obecný Java - tablet problém)." @@ -27538,8 +27589,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "neobvyklá kombinácia značiek (tagov)" @@ -27559,34 +27609,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE Maps" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE Maps (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27596,9 +27635,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Ulice NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27612,102 +27654,148 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Can't search because there is no loaded data." -#~ msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta." - -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "nenájdená predchádzajúca verzia. História je prázdna." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "nenájdená staršia verzia. História je prázdna." - -#~ msgid "No type found. History is empty." -#~ msgstr "Typ nenájdený. História(priebeh) je prázdna." - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade" - -#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" -#~ msgstr "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade" - -#~ msgid "Select a starting node on the end of a way" -#~ msgstr "Vybrať a spustiť body na konci cesty" - -#~ msgid "Reached the end of the line" -#~ msgstr "Je dosiahnutý koniec línie" - -#~ msgid "Reached a junction" -#~ msgstr "Je dosiahnuté spojenie" - -#~ msgid "help" -#~ msgstr "nápoveda" - -#~ msgid "Help / About" -#~ msgstr "Nápoveda / o programe" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambert Zóna 2 cache súbor (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambert Zóna 3 cache súbor (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambert Zóna 4 cache súbor (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambert Zóna 2 cache súbor (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambert Zóna 3 cache súbor (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambert Zóna 4 cache súbor (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambert Zóna 1 cache súbor (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambert Zóna 1 cache súbor (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambert Zóna 1 cache súbor (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambert Zóna 1 cache súbor (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambert Zóna 1 cache súbor (.1)" + +#~ msgid "null detected in node list" +#~ msgstr "prázdny zoznam bodov" #~ msgid "" -#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " -#~ "- these will then show up in the WMS menu.\n" -#~ "\n" -#~ "You can also do this manually in the Advanced Preferences, using the " -#~ "following schema:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Full WMS URL input format example (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " -#~ "only need to input the relevant 'id'.\n" -#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " -#~ "in this example, replacing 73 with your image id:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " -#~ "use." +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." #~ msgstr "" -#~ "Môžete pridať, editovať and mazať WMS údaje vo WMSplugin Preference Tab - " -#~ "toto sa potom zobrazí vo WMS menu.\n" -#~ "\n" -#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite " -#~ "nasledujúcu schému:\n" -#~ "wmsplugin.url.1.name=Landsat\n" -#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" -#~ "wmsplugin.url.2.name=NPE Maps... etc\n" -#~ "\n" -#~ "Úplný WMS URL vstupný format napríklad (landsat)\n" -#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" -#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" -#~ "\n" -#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ," -#~ "potrebujete iba aktuálne vstupné 'id'.\n" -#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL " -#~ "ako v tomto príklade, položenie 73 vášho obrázka id:\n" -#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" -#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" -#~ "\n" -#~ "Poznámka: Použite iba vhodné obrázky, voľne šíriteľné(copyright-wise), ak " -#~ "máte pochybnosti, nepoužite ich." - -#~ msgid "WMS Plugin Help" -#~ msgstr "Nápoveda WMS Pluginu" +#~ "Dôležité : súradnice v dátach sú ďaleko od\n" +#~ "hranice Lambertovej zóny.\n" +#~ "Nenahrávajte žiadne dáta po zobrazení tejto hlášky!\n" +#~ "Urobte spätný krok (undo), uložte vašu prácu\n" +#~ "a začnite v novej vrstve a v novej zóne." + +#~ msgid "Edit Properties" +#~ msgstr "Upraviť vlastnosti" + +#~ msgid "Linked" +#~ msgstr "Spojený" + +#~ msgid "" +#~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +#~ "changeset will automatically be closed by the server after a timeout." +#~ msgstr "" +#~ "Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''." +#~ "
The súbor zmien bude automaticky zavretý na servery po vypršaní " +#~ "časového limitu." + +#~ msgid "Set manually the Lambert zone" +#~ msgstr "Manuálne nastaviť Lambert zone" + +#~ msgid "Zone" +#~ msgstr "Zóna (oblasť)" #~ msgid "Move" @@ -27925,4 +28013,10 @@ #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Nápoveda WMS Pluginu" + +#~ msgid "help" +#~ msgstr "nápoveda" #~ msgid "Navigation" @@ -28447,4 +28541,13 @@ #~ msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got " +#~ msgid "Reached the end of the line" +#~ msgstr "Je dosiahnutý koniec línie" + +#~ msgid "Select a starting node on the end of a way" +#~ msgstr "Vybrať a spustiť body na konci cesty" + +#~ msgid "Reached a junction" +#~ msgstr "Je dosiahnuté spojenie" + #~ msgid "parameter '{0}' must not be null" #~ msgstr "parameter '{0}' nesmie byť nulový" @@ -28529,6 +28632,56 @@ #~ msgstr "Nemôžem nájsť v histórii pôvodné s id {0} v tejto dátovej sade" +#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" +#~ msgstr "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade" + #~ msgid "Error when communicating with server." #~ msgstr "Chyba počas komunikácie so serverom" + +#~ msgid "" +#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab " +#~ "- these will then show up in the WMS menu.\n" +#~ "\n" +#~ "You can also do this manually in the Advanced Preferences, using the " +#~ "following schema:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Full WMS URL input format example (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you " +#~ "only need to input the relevant 'id'.\n" +#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like " +#~ "in this example, replacing 73 with your image id:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't " +#~ "use." +#~ msgstr "" +#~ "Môžete pridať, editovať and mazať WMS údaje vo WMSplugin Preference Tab - " +#~ "toto sa potom zobrazí vo WMS menu.\n" +#~ "\n" +#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite " +#~ "nasledujúcu schému:\n" +#~ "wmsplugin.url.1.name=Landsat\n" +#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +#~ "wmsplugin.url.2.name=NPE Maps... etc\n" +#~ "\n" +#~ "Úplný WMS URL vstupný format napríklad (landsat)\n" +#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +#~ "\n" +#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ," +#~ "potrebujete iba aktuálne vstupné 'id'.\n" +#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL " +#~ "ako v tomto príklade, položenie 73 vášho obrázka id:\n" +#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +#~ "\n" +#~ "Poznámka: Použite iba vhodné obrázky, voľne šíriteľné(copyright-wise), ak " +#~ "máte pochybnosti, nepoužite ich." #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" @@ -28638,4 +28791,7 @@ #~ msgstr "" #~ "Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}" + +#~ msgid "Can't search because there is no loaded data." +#~ msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta." #~ msgid "" @@ -28847,4 +29003,7 @@ #~ "or váš jazyk." +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade" + #~ msgid "Helppage missing. Create it in English." #~ msgstr "" @@ -28860,4 +29019,16 @@ #~ msgid "Unexpected return value. Got {0}." #~ msgstr "neočakávaná hodnota. Dostal {0}" + +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "nenájdená predchádzajúca verzia. História je prázdna." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "nenájdená staršia verzia. História je prázdna." #~ msgid "Index out of bounds. Got {0}." @@ -28897,4 +29068,7 @@ #~ "check the servers address ''{1}'' for typos." +#~ msgid "No type found. History is empty." +#~ msgstr "Typ nenájdený. História(priebeh) je prázdna." + #~ msgid "longitude" #~ msgstr "zemepisná dĺžka" @@ -28905,2 +29079,5 @@ #~ msgid "Coordinate" #~ msgstr "Súradnice" + +#~ msgid "Help / About" +#~ msgstr "Nápoveda / o programe" Index: applications/editors/josm/i18n/po/sl.po =================================================================== --- applications/editors/josm/i18n/po/sl.po (revision 18772) +++ applications/editors/josm/i18n/po/sl.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:17+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 18:13+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,20 +28,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Pomoč" +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#, java-format +msgid "Ignoring malformed URL: \"{0}\"" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:431 -#, java-format -msgid "Ignoring malformed URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -62,21 +62,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -84,6 +82,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -95,11 +93,20 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Pozor" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" @@ -108,17 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Napaka" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -303,5 +304,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -310,27 +311,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -348,5 +349,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Prekliči" @@ -356,19 +357,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -377,5 +378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -488,13 +489,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -592,20 +593,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Datoteka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -641,10 +642,10 @@ msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Združi {0} poti" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "" @@ -688,10 +689,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -710,11 +711,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Prepiši" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Datoteka obstaja. Jo nadomestim?" @@ -761,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -768,6 +769,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -783,7 +784,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Podvoji" @@ -833,30 +833,30 @@ msgstr "Zaključek dela z aplikacijo." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Izvoz v GPX ..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Izvoz v datoteko oblike GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -864,13 +864,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -889,8 +889,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -898,7 +898,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -921,9 +921,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -935,5 +935,5 @@ msgstr "parameter ''{0}'' ne sme biti ničen" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -941,5 +941,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "" @@ -1085,6 +1085,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Nova" @@ -1213,5 +1213,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Prilepi" @@ -1299,11 +1299,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Shrani" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Shrani trenutne podatke" @@ -1358,10 +1358,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Shrani kot..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Shrani trenutne podatke v novo datoteko" @@ -1378,30 +1378,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Prikaži poročilo stanja" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" "Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Pomoč: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Poročilo stanja" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopiraj na odložišče in zapri" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1561,5 +1561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1567,5 +1567,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1612,55 +1612,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Posodobi izbor" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Posodobi izbor" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Kopiraj izbrane predmete v odložišče" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Izbor je prazen" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Posodobi izbor" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1669,5 +1666,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1675,29 +1672,29 @@ msgstr "Ni sprememb za pošiljanje." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Ni česa poslati. Najprej pridobite kakšne podatke." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1711,11 +1708,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1726,5 +1723,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1734,22 +1731,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1760,19 +1757,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1781,5 +1778,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1788,15 +1785,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1908,17 +1905,17 @@ msgstr "Počasneje naprej" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Sprejem podatkov GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Sprejem podatkov" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1926,5 +1923,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1978,9 +1975,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Napake pri sprejemu" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -1998,5 +1995,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2004,5 +2001,5 @@ msgstr "Način: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2099,7 +2096,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2108,9 +2104,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Povlecite segment poti za ustvarjenje pravokotnika." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2122,5 +2117,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2140,17 +2135,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Premakni elemente" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Premakni jih" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Razveljavi premik" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2160,13 +2155,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2175,9 +2170,9 @@ "najbližjo točko." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Za prenehanje vrtenja izpustite miškin gumb." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2185,15 +2180,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Povečava" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Povečava in premik zemljevida" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2201,10 +2196,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Išči..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2213,58 +2208,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Prosim, vnesite iskalni izraz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "regularni izraz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "nadomesti izbor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "dodaj v izbor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "odstrani iz izbora" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "upoštevaj velikost črk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "regularni izraz" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2272,34 +2266,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2307,43 +2301,43 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "modified - all changed objects" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2353,51 +2347,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Začni iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "Najdeno {0} zadetkov" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "" @@ -2411,40 +2405,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2453,9 +2447,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2464,5 +2458,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2560,7 +2554,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2672,5 +2666,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2695,5 +2689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2701,6 +2695,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2767,17 +2761,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2811,10 +2795,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2847,20 +2831,20 @@ msgstr "Zaporedje" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2882,10 +2866,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2927,5 +2911,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nova vrednost" @@ -2981,10 +2965,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -2993,5 +2977,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3000,5 +2984,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3007,5 +2991,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3014,5 +2998,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3020,5 +3004,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3027,5 +3011,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3034,5 +3018,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3041,5 +3025,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3048,10 +3032,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3132,25 +3116,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "J" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "S" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "Z" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3158,5 +3142,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3164,5 +3148,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3172,26 +3156,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3200,5 +3184,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3261,24 +3245,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3286,5 +3270,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3312,10 +3296,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3326,7 +3310,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "parameter ''{0}'' ne sme biti ničen" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3480,10 +3464,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Napaka: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3495,6 +3479,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3506,5 +3490,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3516,6 +3500,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3535,6 +3519,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "ozadje" @@ -3552,19 +3536,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +msgid "Lambert CC Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3578,26 +3578,51 @@ msgstr "Merkator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3612,10 +3637,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Ne prikaži več" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3623,32 +3648,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "nepopoln" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "cesta" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "železnica" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vodotok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "raba tal" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3659,5 +3684,5 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3697,6 +3722,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Spor" @@ -3706,11 +3731,11 @@ msgstr "Neznan gostitelj" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3906,11 +3931,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4025,5 +4050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4031,18 +4056,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(ni predmeta)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "plasti ni na seznamu." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4163,67 +4188,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "Lastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Oznake" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "Vozlišča" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Člani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4231,68 +4256,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "Odpravljanje sporov" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4300,5 +4325,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4306,30 +4331,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4337,5 +4362,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4343,14 +4368,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4358,5 +4383,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4364,54 +4389,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "Gor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "Premakni izbrani element za eno mesto višje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "Dol" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "Premakni izbrani element za eno mesto nižje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Odstrani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "Zamrzni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "Odmrzni" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4420,5 +4445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4427,5 +4452,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4434,5 +4459,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4441,5 +4466,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4448,6 +4473,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4456,6 +4481,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4466,5 +4491,5 @@ msgstr "Vozlišče" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4476,5 +4501,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4483,19 +4508,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4504,9 +4529,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4516,5 +4541,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4538,84 +4563,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "izbrisano" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4625,17 +4650,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4644,9 +4669,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4661,19 +4686,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4689,10 +4714,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4702,10 +4727,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4732,27 +4757,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4777,22 +4802,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4800,5 +4825,5 @@ msgstr "brez" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4889,6 +4914,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4899,5 +4924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4911,21 +4936,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4933,5 +4958,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5018,10 +5043,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5041,17 +5066,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Razreši" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5060,25 +5085,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5090,13 +5115,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5108,8 +5133,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5176,5 +5201,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5206,34 +5231,34 @@ msgstr "Odpri seznam vseh naloženih plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Izbriši izbrano plast." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Prikaži/skrij" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Preklopi vidljivost izbrane plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Pomakni izbrano plast vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Pomakni izbrano plast vrstico nižje." @@ -5243,20 +5268,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Spremenili boste do {0} predmetov." -msgstr[1] "Spremenili boste do {0} predmet." -msgstr[2] "Spremenili boste do {0} predmeta." -msgstr[3] "Spremenili boste do {0} predmete." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Prazna vrednost izbriše ključ" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5265,10 +5287,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Sprememba vrednosti?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5279,5 +5301,5 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5288,9 +5310,9 @@ msgstr[3] "Spremenili boste do {0} predmete." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Izberite ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Izberite vrednost" @@ -5314,102 +5336,98 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Latnosti: {0} / Članstva: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Lastnosti / Članstva" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Spremeni relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Naj res izbrišem izbor iz relacije {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Izbriši izbrani ključ vsem predmetom." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nov par ključ/vrednost vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Spremeni vrednost izbranega ključa vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Latnosti: {0} / Članstva: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Lastnosti / Članstva" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Spremeni relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Naj res izbrišem izbor iz relacije {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Izbriši izbrani ključ vsem predmetom." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relacije" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Odpri seznam vseh relacij." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Odpri urejevalnik za izbrano relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Izbriši izbrano relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Ustvari novo relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5438,5 +5456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5448,14 +5466,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5536,12 +5554,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5559,5 +5577,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5565,5 +5583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5571,18 +5589,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5591,14 +5609,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5608,9 +5626,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5620,15 +5638,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5636,5 +5654,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5642,20 +5660,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5664,66 +5682,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Pomakni izbranega člana vrstico višje." #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5732,9 +5750,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5743,41 +5761,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5787,19 +5805,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Sprejem podatkov" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5820,10 +5845,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5837,5 +5858,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5905,9 +5926,9 @@ msgstr "Zaznamki" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5916,52 +5937,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5970,52 +5991,52 @@ "Povezava na www.openstreetmap.org (za sprejem področja sem prilepite URL)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Pravokotno področje" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Viri in vrste podatkov" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "Podatki OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Surovi podatki GPS" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Sprejmi kot novo plast" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6023,39 +6044,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Sprejmi področje" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Sprejemanje" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Področje za sprejem je preveliko; najbrž bo strežnik zahtevo zavrnil" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" "Področje sprejema v redu, velikost bo verjetno sprejemljiva za strežnik" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6077,21 +6098,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6830,8 +6851,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7004,5 +7025,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7014,5 +7035,5 @@ msgstr "Vrsta" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7059,5 +7080,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7071,5 +7092,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7080,5 +7101,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7087,19 +7108,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7109,32 +7130,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7156,5 +7177,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7216,7 +7237,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parameter ''{0}'' ne sme biti ničen" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7246,33 +7267,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Povečava na težavo" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "Zgodovina" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7298,7 +7317,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7338,7 +7356,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonimno" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7366,12 +7383,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Različica {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "izbrisano" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7429,10 +7445,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7643,5 +7659,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7664,17 +7680,17 @@ msgstr "Plast" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7690,7 +7706,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7733,29 +7749,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7763,38 +7779,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7802,16 +7818,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7855,24 +7871,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Točka {0} x {1} nima časovne oznake" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7880,33 +7896,33 @@ msgstr "Berem {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Ni moč najti slik z berljivo časovno oznako." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Slike z geografskim položajem" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "Začetek GPS sledi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "Konec GPS sledi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "trenutna razlika: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "razlika časovnih pasov: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7917,14 +7933,14 @@ msgstr[3] "slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} znotraj sledi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Uskladi uro" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7932,32 +7948,32 @@ msgstr "Slike JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V datoteki \"{0}\" manjka EXIF čas." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Slika" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Uskladite čas z GPS napravo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Vpisanega časa ni bilo mogoče razpoznati." @@ -8047,5 +8063,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8097,10 +8113,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Pretvori v podatkovno plast" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8108,11 +8124,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8122,29 +8138,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8155,9 +8171,9 @@ "nadaljevati?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8165,5 +8181,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8171,23 +8187,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "izven sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8196,5 +8212,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8208,5 +8224,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8219,11 +8235,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8232,22 +8248,34 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8348,9 +8376,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Prikaži/skrij besedilo/ikone" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "" @@ -8412,5 +8440,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8418,5 +8446,5 @@ msgstr "Prosim izberite vrstico za urejanje." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8424,5 +8452,5 @@ msgstr "Nova vrednost za {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8431,5 +8459,5 @@ msgstr "Prosim izberite vrstico za izbris." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Vpišite nov par ključ/vrednost" @@ -8552,40 +8580,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Barva" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Izberite" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Izberite barvo za {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "Barve različnih predmetov v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Barve" @@ -9018,17 +9046,17 @@ msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Oblika prikaza koordinat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Geografska projekcija" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9038,5 +9066,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9094,81 +9122,81 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9177,6 +9205,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9342,10 +9370,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9355,13 +9383,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9369,18 +9397,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9391,15 +9419,15 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9411,18 +9439,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -9438,6 +9466,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9446,8 +9474,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Sprejem točk od {0} do {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9564,11 +9605,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9578,40 +9619,40 @@ msgstr "Sprejemanje podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9674,5 +9715,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9685,66 +9726,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Pošiljanje ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9779,5 +9820,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9804,5 +9845,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9810,5 +9851,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9821,5 +9862,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9970,5 +10011,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9977,38 +10018,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10016,19 +10057,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "predmet z id=0 ni dovoljen" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10038,10 +10079,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10051,25 +10090,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10534,5 +10573,5 @@ msgstr "(besedilo je že bilo prekopirano na odložišče.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10541,12 +10580,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10556,5 +10588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10564,10 +10596,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10576,5 +10603,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10583,5 +10610,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10590,9 +10617,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10602,5 +10636,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10609,5 +10643,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10616,5 +10650,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10623,10 +10657,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10635,10 +10669,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10649,5 +10683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10657,5 +10691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11362,5 +11396,5 @@ msgstr "Napaka v datoteki {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11373,28 +11407,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11424,13 +11475,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11439,13 +11490,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11725,43 +11776,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11769,5 +11825,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11798,5 +11854,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "" @@ -11824,5 +11880,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11830,28 +11886,28 @@ msgstr "Prazna plast" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11860,24 +11916,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12905,20 +12952,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13040,13 +13087,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13616,5 +13659,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" +msgid "Unconnected coastline" msgstr "" @@ -14256,12 +14299,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Sprejemanje" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Sprejmi podatke zemljevida s strežnika OSM." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14299,7 +14340,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Podvojena vozlišča" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14365,29 +14405,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14396,5 +14436,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14402,10 +14442,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14418,24 +14458,24 @@ msgstr "Samodejno sprejemanje" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14446,57 +14486,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Shrani plast WMS v datoteko" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Naloži plast WMS iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Zaznamki" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26806,8 +26851,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26827,34 +26871,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26864,9 +26897,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26880,22 +26916,70 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "help" -#~ msgstr "pomoč" - -#~ msgid "Help / About" -#~ msgstr "Pomoč / O programu" - -#~ msgid "WMS Plugin Help" -#~ msgstr "Pomoč vstavka WMS" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" #~ msgid "Move" @@ -27014,4 +27098,10 @@ #~ msgstr "povečava" +#~ msgid "help" +#~ msgstr "pomoč" + +#~ msgid "Help / About" +#~ msgstr "Pomoč / O programu" + #~ msgid "Validate" #~ msgstr "Preveri" @@ -27052,4 +27142,7 @@ #~ msgid "Plugin already exists" #~ msgstr "Vstavek že obstaja" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Pomoč vstavka WMS" #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" Index: applications/editors/josm/i18n/po/sv.po =================================================================== --- applications/editors/josm/i18n/po/sv.po (revision 18772) +++ applications/editors/josm/i18n/po/sv.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-14 19:58+0000\n" -"Last-Translator: zvenzzon \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 18:09+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Hjälp" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Varning" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Hoppar över felaktig URL till en fil: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "Kunde inte läsa filen ''{0}''.
Felet är:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,17 +114,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "Kunde inte läsa filen ''{0}''.
Felet är:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -125,8 +123,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -136,21 +134,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -174,8 +172,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -188,6 +189,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Fel" @@ -208,6 +209,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -306,5 +307,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -313,27 +314,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -351,5 +352,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "Avbryt" @@ -359,19 +360,19 @@ msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "Välj ett mål lager." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "Välj ett mål lager." -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../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:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Sammanfoga" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -382,5 +383,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "Inga mål lager" @@ -493,13 +494,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -597,20 +598,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Arkiv: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "Inga changesets är påbörjade" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "Inga påbörjade changesets" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -650,10 +651,10 @@ "noder av dem)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Slå ihop {0} sträckor" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Välj åtminstone två sträckor att slå ihop" @@ -699,10 +700,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -721,11 +722,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Skriv över" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Filen existerar redan. Vill du skriva över?" @@ -773,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -780,6 +781,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -795,7 +796,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -823,5 +823,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Duplicera" @@ -845,30 +845,30 @@ msgstr "Avsluta programmet." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "Alla format" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportera till GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportera data till en GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Det finns inte något att exportera. Skaffa lite data först." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -876,13 +876,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -901,8 +901,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -910,7 +910,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -933,9 +933,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -947,5 +947,5 @@ msgstr "parametern ''{0}'' får inte vara null" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -953,5 +953,5 @@ msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "Exportera till GPX fil" @@ -1097,6 +1097,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Ny" @@ -1228,5 +1228,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Klistra in" @@ -1316,11 +1316,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Spara" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Spara nuvarande data." @@ -1377,10 +1377,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Spara som..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Spara nuvarande data i en ny fil." @@ -1399,30 +1399,30 @@ "ofullständiga objekt." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "Visa statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "" "Visa statusrapport med information som kan vara av nytta vid felrapportering." -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "Hjälp: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "Statusrapport" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "Kopiera till urklipp och stäng" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1590,5 +1590,5 @@ msgstr "Frigjord nod" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1596,5 +1596,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1641,55 +1641,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "Inget dataset kunde hittas" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "Uppdatera markering" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "Uppdatera markering" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Det finns inga markerade primitiv att uppdatera." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "Tom markering" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "Uppdatera markering" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1698,5 +1695,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1704,29 +1701,29 @@ msgstr "Det finns inte några ändringar att skicka in." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Det finns inte någonting att skicka in. Skaffa lite data först." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "Synkronisera hela datasetet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1740,11 +1737,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1760,5 +1757,5 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1768,22 +1765,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1794,19 +1791,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "Uppdaterar primitiv" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1815,5 +1812,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1822,15 +1819,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1942,17 +1939,17 @@ msgstr "Långsammare framåt" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "Hämtar GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "Hämtade GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Hämtar data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1960,5 +1957,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -2017,9 +2014,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "Fel under nedladdning" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2037,5 +2034,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2043,5 +2040,5 @@ msgstr "Läge: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2138,7 +2135,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2147,9 +2143,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Dra en delsträcka för bilda en rektangel." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2163,5 +2158,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2181,17 +2176,17 @@ msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "Flytta element" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "Flytta" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "Ångra flytt" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2201,13 +2196,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Släpp musknappen för att välja objekten i rektangeln." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2216,9 +2211,9 @@ "nod." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Släpp musknappen för att sluta rotera." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2228,15 +2223,15 @@ "växla läge); Skift+Ctrl för att rotera" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zooma:" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zooma och flytta kartan" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2246,10 +2241,10 @@ "ned, höger; flytta karta med högerknappen" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Sök..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2258,42 +2253,41 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Ange en söksträng." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "reguljärt uttryck" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "ersätt urval" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "utöka urval" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "ta bort från urval" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "gör skillnad på gemener/VERSALER" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "reguljärt uttryck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -2301,5 +2295,5 @@ "värde som helst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" @@ -2307,13 +2301,13 @@ "som helst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' var som helst i nyckeln name." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2321,17 +2315,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - som inte har 'Bak' i nyckeln name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - som innehåller nyckeln foot oavsett dess värde." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "Särskilda mål:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" @@ -2340,17 +2334,17 @@ "relation för relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "user:... - alla objekt som ändrats av användare..." +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt med givent antal noder" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2358,35 +2352,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "modified - alla ändrade objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "selected - alla valda objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "incomplete - alla ofullständiga objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "otaggade - alla otaggede objekt" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use | or OR to combine with logical or" msgstr "Använd | eller OR för att kombinera med logiskt ELLER" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2394,9 +2388,9 @@ "innehåller :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "Använd ( och ) för att gruppera uttryck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2406,51 +2400,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Sök" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "Påbörja sökning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "Inga sökträffar för ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Urvalet utökades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Urvalet begränsades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "{0} sökträffar" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 +msgid "CI" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 msgid "RX" msgstr "RX" @@ -2468,40 +2462,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "Det saknas argument för eller (or)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "Det saknas argument för inte (not)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "En avslutande parentes förväntades" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2510,9 +2504,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "Felaktigt antal parametrar för nodoperator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2521,5 +2515,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2624,7 +2618,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2734,5 +2728,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2757,5 +2751,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2763,6 +2757,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2832,17 +2826,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2876,10 +2860,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2914,20 +2898,20 @@ msgstr "Sekvens" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2949,10 +2933,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2996,5 +2980,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Nytt värde" @@ -3041,7 +3025,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "Parameter {0} > 0 krävs. Erhöll {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3050,10 +3034,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "Fel i konfigurationsfilen på raderna {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3062,5 +3046,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3069,5 +3053,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3076,5 +3060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3083,5 +3067,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3089,5 +3073,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3096,5 +3080,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3103,5 +3087,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3110,5 +3094,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3117,10 +3101,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3201,25 +3185,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "S" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "N" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "V" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "Ö" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3227,5 +3211,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3233,5 +3217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3241,26 +3225,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "Det saknas argument för inte (not)." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3269,5 +3253,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3330,24 +3314,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3355,5 +3339,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3381,10 +3365,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3395,7 +3379,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "Parameter {0} > 0 krävs. Erhöll {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3414,7 +3398,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3549,10 +3533,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Fel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3564,6 +3548,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3573,5 +3557,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3581,6 +3565,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3598,6 +3582,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "bakgrund" @@ -3615,24 +3599,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"VIKTIGT : det finns data långt bort\n" -"från nuvarande Lambertzongränser.\n" -"Skicka inte in några data efter du fått detta meddelande.\n" -"Ångra din sista åtgärd, spara ditt arbete\n" -"och börja på ett nytt lager i den nya zonen." - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambertzon" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3646,26 +3642,52 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zon" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3680,10 +3702,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Visa inte igen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3691,32 +3713,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "ofullständig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "landsväg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "järnväg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "vattendrag" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "markanvändning" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3725,5 +3747,5 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3761,6 +3783,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Konflikt" @@ -3770,11 +3792,11 @@ msgstr "Okänd värddator" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3978,11 +4000,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4097,5 +4119,5 @@ msgstr "Längden hos den nya delsträcka som håller på att ritas." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4103,18 +4125,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(inget objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "lagret finns inte i listan." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4235,67 +4257,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "Taggar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4303,68 +4325,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4372,5 +4394,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4378,30 +4400,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4409,5 +4431,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4415,14 +4437,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4430,5 +4452,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4436,54 +4458,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Ta bort" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4492,5 +4514,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4499,5 +4521,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4506,5 +4528,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4513,5 +4535,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4520,6 +4542,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4528,6 +4550,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4538,5 +4560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4548,5 +4570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4555,19 +4577,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "Ja, återskapa dem också" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "Nej, avbryt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4578,9 +4600,9 @@ "raderade på servern.

Vill du återskapa dessa noder också?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "Återskapa ytterligare noder?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4590,5 +4612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4612,84 +4634,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "raderad" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4699,17 +4721,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4718,9 +4740,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4735,19 +4757,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4763,10 +4785,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4776,10 +4798,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4806,27 +4828,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4851,22 +4873,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4874,5 +4896,5 @@ msgstr "inget" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4963,6 +4985,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4973,5 +4995,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4985,21 +5007,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -5007,5 +5029,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5092,10 +5114,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5115,18 +5137,18 @@ msgstr "Kommandolista: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Jämka" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "" "Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5135,25 +5157,25 @@ msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5165,13 +5187,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5183,8 +5205,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5251,5 +5273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5281,34 +5303,34 @@ msgstr "Öppna en lista av alla inlästa lager." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Ta bort valt lager." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Visa/Dölj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Alternera visning av det valda lagret." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Flytta det valda lagret en rad upp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Flytta det valda lagret en rad ner." @@ -5318,18 +5340,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "Detta kommer att ändra upp till {0} objekt." -msgstr[1] "Detta kommer att ändra upp till {0} objekt." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Om värdet är tomt tas nyckeln bort." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5338,10 +5359,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Ändra värden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5350,5 +5371,5 @@ msgstr[1] "Ändra egenskaper för upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5357,9 +5378,9 @@ msgstr[1] "Detta kommer att ändra upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Välj en nyckel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Välj ett värde" @@ -5383,102 +5404,98 @@ msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Lägg till egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Egenskaper: {0} / Medlemskap: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Egenskaper / Roller" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "Ändra relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "Ta bort från relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Verkligen ta bort det valda från relation {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Ta bort den valda nyckeln från alla objekt." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Ta bort egenskaper" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Redigera egenskaper" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Redigera värdet av den valda nyckeln för alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Egenskaper: {0} / Medlemskap: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Egenskaper / Roller" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "Ändra relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "Ta bort från relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Verkligen ta bort det valda från relation {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Ta bort den valda nyckeln från alla objekt." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Ta bort egenskaper" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "Öppna en lista över alla relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "Relationer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Öppna en redigerare för den valda relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Ta bort den valda relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Skapa en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5507,5 +5524,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5517,9 +5534,9 @@ msgstr "Urval: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Lossa panelen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5528,5 +5545,5 @@ "vänstra verktygraden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "Klicka för att minimera/maximera panelens innehåll" @@ -5607,12 +5624,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "Datakonflikter" @@ -5630,5 +5647,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5636,5 +5653,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5642,18 +5659,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5662,14 +5679,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5679,9 +5696,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5691,15 +5708,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5707,5 +5724,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5713,20 +5730,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5735,66 +5752,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Flytta vald medlem/valda medlemmar uppåt" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Flytta vald medlem/valda medlemmar nedåt" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5803,9 +5820,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5814,41 +5831,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Hämta alla ofullständiga sträckor och noder i relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5858,19 +5875,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Hämtar {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5891,10 +5915,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5908,5 +5928,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5976,9 +5996,9 @@ msgstr "Bokmärken" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5987,52 +6007,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6042,52 +6062,52 @@ "hem området)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Gränsvärden" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Datakällor och -typer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Rå GPS-data" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Hämta som ett nytt lager" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6095,39 +6115,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Hämta område" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "Hämta" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "" "Hämtningsområdets storlek är ok, kommer troligen accepteras av servern." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6149,21 +6169,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6902,8 +6922,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7076,5 +7096,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7086,5 +7106,5 @@ msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7131,5 +7151,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7143,5 +7163,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7152,5 +7172,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7159,19 +7179,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7181,32 +7201,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7228,5 +7248,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7288,12 +7308,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "Parameter {0} > 0 krävs. Erhöll {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "Parameter {0} > 0 krävs. Erhöll {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7318,33 +7338,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Zooma till problem" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "historiskt" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7353,7 +7371,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "Sortera snabbvalsmenyn" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7371,7 +7388,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7411,7 +7427,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonym" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7439,12 +7454,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Version {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "raderad" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7502,10 +7516,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7716,5 +7730,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7737,17 +7751,17 @@ msgstr "Lager" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7763,7 +7777,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7806,29 +7820,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "Skicka in ändringar" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7836,38 +7850,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Ge en kort kommentar till de ändringar som du skickar in:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7875,16 +7889,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7928,24 +7942,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Bilder för {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Läs in GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Tid saknas för punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7953,33 +7967,33 @@ msgstr "Läser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Inga bilder med läsbara tidsangivelser hittades." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geotaggade bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS startpunkt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS slutpunkt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "nuvarande delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "tidsskillnad: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7988,14 +8002,14 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} inom spåret." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Synka klocka" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8003,32 +8017,32 @@ msgstr "JPEG-bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datum i fil \"{0}\" kunde inte tolkas." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "Tidszon för GPS-enhet (skillnad mot foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisera Tid med GPS-enheten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Angiven tid kunde inte tolkas." @@ -8118,5 +8132,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8168,10 +8182,10 @@ msgstr[1] "{0} sträckpunkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Omvandla till datalager" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8181,11 +8195,11 @@ "skicka in spår, se här:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8195,29 +8209,29 @@ msgstr "Omvandlad från:{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "Hämta från OSM längs med detta spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Hämta allting inom:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Största tillåtna område per begäran:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8228,9 +8242,9 @@ "Önskar du
fortsätta?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8240,5 +8254,5 @@ "än dess slut uteslöts eller flyttades till början." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8248,23 +8262,23 @@ "kunna uppskattas med någon rimlighet uteslöts." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "Datalager {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "utanför hämtat område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8273,5 +8287,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8285,5 +8299,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8296,11 +8310,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8309,22 +8323,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "Det finns inte någon \"från\"-sträcka." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8421,9 +8448,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Visa/Dölj text/ikoner" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Växla visning av markörtext och ikoner." @@ -8488,5 +8515,5 @@ "Förvalt värde är för närvarande okänt (inställningen har inte använts än)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8494,5 +8521,5 @@ msgstr "Välj vilken rad du vill ändra." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8500,5 +8527,5 @@ msgstr "Nytt värde för {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8507,5 +8534,5 @@ msgstr "Välj vilken rad du vill ta bort." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Ange ett nytt nyckel/värde-par" @@ -8641,40 +8668,40 @@ msgstr "Kalibrering av röstinspelare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Färg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Ritstil{0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "Lager: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Välj" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "Välj en färg för {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "Sätt till förval" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "Sätt allt till förval" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "De färger som används av olika objekt i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Färger" @@ -9120,17 +9147,17 @@ "Du behöver starta om JOSM för att vissa inställningar skall slå igenom." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "Visa koordinater som" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projektionsmetod" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9140,5 +9167,5 @@ msgstr "Kartprojektion" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9196,81 +9223,81 @@ msgstr "Kortkommando" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9279,6 +9306,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9472,10 +9499,10 @@ msgstr "Modifierargrupper" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9485,13 +9512,13 @@ msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9499,18 +9526,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Valfria attribut:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "slutenväg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "Okänd typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9521,15 +9548,15 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "Fel vid tolkning {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekt av typ {0} stöds." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9539,18 +9566,18 @@ msgstr[1] "Ändra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -9566,6 +9593,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9574,8 +9601,21 @@ msgstr "Ansluter till OSM-servern..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Hämtar punkter {0} till {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9692,11 +9732,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9706,40 +9746,40 @@ msgstr "Hämtar OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9802,5 +9842,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9813,66 +9853,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Förbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Skickar in..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9907,5 +9947,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9932,5 +9972,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9938,5 +9978,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9949,5 +9989,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10099,5 +10139,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10106,38 +10146,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10145,19 +10185,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Ofullständig -specifikation med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Ogiltigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10167,10 +10207,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10180,25 +10218,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10669,5 +10707,5 @@ msgstr "(Texten finns redan i urklipp.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10676,12 +10714,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10691,5 +10722,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10702,10 +10733,5 @@ "är:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10714,5 +10740,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10721,5 +10747,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10728,9 +10754,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10740,5 +10773,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10747,5 +10780,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10754,5 +10787,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10761,10 +10794,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10773,10 +10806,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10787,5 +10820,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10795,5 +10828,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11525,5 +11558,5 @@ msgstr "Fel i fil {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11536,29 +11569,48 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Fel vid läsning av fil" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambertzon 1 cachefil (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambertzon 1 cachefil (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambertzon 1 cachefil (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambertzon 1 cachefil (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambertzon 1 cachefil (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11587,13 +11639,13 @@ msgstr "Välj en av..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "Automatkälla" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11602,13 +11654,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11894,43 +11946,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zon" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "Lambertzon" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "Hämta plats från cachen (enbart om cache är aktiverad)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "Byt plats" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "Ange en ny plats för nästa förfrågan" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "Lägg till ett nytt lager" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "Plats" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11938,5 +11995,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "Lägg till ett nytt lager" @@ -11967,5 +12024,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "Justera WMS" @@ -11993,5 +12050,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11999,28 +12056,28 @@ msgstr "Tomt lager" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS-lager ({0}), {1} ruta/rutor inlästa" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "Är inte vektoriserad" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "Är vektoriserad" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12031,24 +12088,15 @@ "Skapa en ny." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "Cacheformatsfel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -13099,20 +13147,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Vill du tillåta detta?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "Bekräfta fjärrstyrd handling" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Fjärrstyrning har begärts för att importera data från följande URL:" @@ -13234,13 +13282,9 @@ msgstr "Minska zoomläge" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13829,6 +13873,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Oordnad kustlinje" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14491,12 +14536,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "Hämta" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Hämta kartdata från OSM-servern." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14512,9 +14555,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"Det finns inga lager som lagret
''{0}''
kan sammanfogas med." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14536,7 +14577,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Tar bort dubblettnoder..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14602,29 +14642,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "Justera valt WMS-lagers läge" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14633,5 +14673,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14639,10 +14679,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14655,24 +14695,24 @@ msgstr "Automatisk hämtning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14683,57 +14723,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "Hämta WMS-lager från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Fel filformat" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Bokmärken" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27048,8 +27093,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "ovanlig kombination av taggar" @@ -27069,34 +27113,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE-kartor" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPE-kartor (Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -27106,9 +27139,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27122,31 +27158,127 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "Det finns inget primitiv med version {0} i denna historik" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "ingen tidigaste version funnen. Historiken är tom." - -#~ msgid "No latest version found. History is empty." -#~ msgstr "ingen senaste version funnen. Historiken är tom." - -#~ msgid "help" -#~ msgstr "hjälp" - -#~ msgid "Help / About" -#~ msgstr "Hjälp / Om" - -#~ msgid "WMS Plugin Help" -#~ msgstr "Hjälp om WMS-insticksmodulen" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE-kartor" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPE-kartor (Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambertzon 1 cachefil (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambertzon 1 cachefil (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambertzon 1 cachefil (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambertzon 1 cachefil (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambertzon 1 cachefil (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambertzon 1 cachefil (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambertzon 1 cachefil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambertzon 1 cachefil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambertzon 1 cachefil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambertzon 1 cachefil (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambertzon 1 cachefil (.1)" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "VIKTIGT : det finns data långt bort\n" +#~ "från nuvarande Lambertzongränser.\n" +#~ "Skicka inte in några data efter du fått detta meddelande.\n" +#~ "Ångra din sista åtgärd, spara ditt arbete\n" +#~ "och börja på ett nytt lager i den nya zonen." + +#~ msgid "Edit Properties" +#~ msgstr "Redigera egenskaper" #~ msgid "Move" @@ -27330,4 +27462,13 @@ #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "WMS Plugin Help" +#~ msgstr "Hjälp om WMS-insticksmodulen" + +#~ msgid "Help / About" +#~ msgstr "Hjälp / Om" + +#~ msgid "help" +#~ msgstr "hjälp" #~ msgid "Validate" @@ -27730,8 +27871,4 @@ #~ "laddat ner ett datalager?" -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}" - #~ msgid "Remove route nodes" #~ msgstr "Ta bort ruttnoder" @@ -27886,2 +28023,11 @@ #~ msgid "Unexpected return value. Got {0}." #~ msgstr "oförväntat returvärde. Erhöll {0}" + +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "Det finns inget primitiv med version {0} i denna historik" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "ingen tidigaste version funnen. Historiken är tom." + +#~ msgid "No latest version found. History is empty." +#~ msgstr "ingen senaste version funnen. Historiken är tom." Index: applications/editors/josm/i18n/po/tr.po =================================================================== --- applications/editors/josm/i18n/po/tr.po (revision 18772) +++ applications/editors/josm/i18n/po/tr.po (revision 18773) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 14:33+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-17 17:33+0000\n" "Last-Translator: katpatuka \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,20 +29,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "Yardım" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Yanlış linkler atlanıldı: URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -63,21 +63,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -85,6 +83,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -96,12 +94,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "Uyarı" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "hatalı dosya atlandı URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -109,17 +116,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -127,8 +125,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -138,21 +136,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -176,8 +174,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -190,6 +191,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "Hata" @@ -210,6 +211,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -304,5 +305,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -311,27 +312,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -349,5 +350,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "İptal" @@ -357,19 +358,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "Birleştir" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -378,5 +379,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "" @@ -489,13 +490,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -593,20 +594,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "Dosya: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -644,10 +645,10 @@ msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0} yol birleştir" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Lütfen birleştirmek için en az iki yol seçiniz." @@ -693,10 +694,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -715,11 +716,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "Üzerine Yaz" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "Dosya mevcut. Üzerine Yaz?" @@ -766,5 +767,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -773,6 +774,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -788,7 +789,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -816,5 +816,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "Çift" @@ -838,30 +838,30 @@ msgstr "Programı Kapat." -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "GPX olarak kaydet..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Veri GPX dosyası olarak kaydet." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "Dışa vermek için bir şey yok. Önce veri al, salak!" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -869,13 +869,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -894,8 +894,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -903,7 +903,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -926,9 +926,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -940,5 +940,5 @@ msgstr "parametre ''{0}'' zero (null) olamaz" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -946,5 +946,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "GPX dosyası olarak kaydet..." @@ -1090,6 +1090,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "Yeni" @@ -1218,5 +1218,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "Yapıştır" @@ -1305,11 +1305,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Kaydet" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Şimdiki bilgiyi kaydet." @@ -1364,10 +1364,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Farklı Kaydet..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Varolan bilgileri yeni bir dosyaya kaydet." @@ -1386,29 +1386,29 @@ "eksik objeleride seçer" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 +msgid "Show Status Report" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 -msgid "Show Status Report" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 msgid "Show status report with useful information that can be attached to bugs" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1565,5 +1565,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1571,5 +1571,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1616,55 +1616,52 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" -msgstr "seçimi değiştiriniz" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "Seçili objeleri yapıştır alanına (buffer) kopyala." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "# Objeler" - +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1673,5 +1670,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1679,29 +1676,29 @@ msgstr "Yüklenilecek değişiklik yok." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" +msgid "Synchronize way {0} only" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1715,11 +1712,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1730,5 +1727,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1738,22 +1735,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1764,19 +1761,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1785,5 +1782,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1792,15 +1789,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1912,17 +1909,17 @@ msgstr "Yavaş İleri Götür" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "GPS verisi indiriliyor" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "Bilgi İndiriliyor" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1930,5 +1927,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "" @@ -1982,9 +1979,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "" @@ -2002,5 +1999,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2008,5 +2005,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2103,8 +2100,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." msgstr "" -"İstediğiniz boyutta bir dikdörtgen çizin, sonra fare düğmesini bırakınız." #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2114,9 +2109,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "Dikdörtgen çizmek için bir yol segmentini sürükleyin." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2130,5 +2124,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2148,17 +2142,17 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2168,13 +2162,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2183,9 +2177,9 @@ "yapıştır." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2193,15 +2187,15 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "Zoom ve Harita Taşı" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2211,10 +2205,10 @@ "sağzoom taşı ise sağ klik" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "Ara..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2223,58 +2217,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "Lütfen bir aramametni giriniz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "ifade anlatımı" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "seçimi değiştiriniz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "seçime ekleyiniz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "Seçimden çıkartınız" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "Harf hassas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "ifade anlatımı" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -msgid "name:Bak - 'Bak' anywhere in the name." +msgid "type=route - key 'type' with value exactly 'route'." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2282,34 +2275,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -msgid "-name:Bak - not 'Bak' in the name." +msgid "foot: - key=foot set to any value." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -msgid "foot: - key=foot set to any value." +msgid "Special targets:" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 -msgid "Special targets:" +msgid "" +"type: - type of the object (node, way, relation)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" +msgid "user:... - all objects changed by user" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 -msgid "user:... - all objects changed by user" +msgid "id:... - object with given ID (0 for new objects)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" +msgid "nodes:... - object with given number of nodes" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2317,43 +2310,43 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +msgid "modified - all changed objects" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 -msgid "modified - all changed objects" +msgid "selected - all selected objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 -msgid "selected - all selected objects" +msgid "incomplete - all incomplete objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 -msgid "incomplete - all incomplete objects" +msgid "untagged - all untagged objects" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 -msgid "untagged - all untagged objects" +msgid "" +"child expr - all children of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" -"child expr - all children of objects matching the expression" +"parent expr - all parents of objects matching the expression" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 -msgid "" -"parent expr - all parents of objects matching the expression" +msgid "Use | or OR to combine with logical or" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 -msgid "Use | or OR to combine with logical or" +msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2363,51 +2356,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "Arama" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "''{0}'' için herhangi karşılık bulunamadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "{0} Eşleşme bulundu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2424,40 +2417,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "or için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "not için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "Parantezlerin kapanması beklenir." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2466,9 +2459,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2477,5 +2470,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2573,7 +2566,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2682,5 +2675,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "" @@ -2705,5 +2698,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2711,6 +2704,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2779,17 +2772,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" msgstr "" @@ -2823,10 +2806,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2859,20 +2842,20 @@ msgstr "Sıra" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2894,10 +2877,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2941,5 +2924,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "Yeni Değer" @@ -2995,10 +2978,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3007,5 +2990,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3014,5 +2997,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3021,5 +3004,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3028,5 +3011,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3034,5 +3017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3041,5 +3024,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3048,5 +3031,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3055,5 +3038,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3062,10 +3045,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3146,25 +3129,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "G" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "K" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "B" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "D" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3172,5 +3155,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3178,5 +3161,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3186,26 +3169,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "not için eksik argüman." - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3214,5 +3197,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3275,24 +3258,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3300,5 +3283,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3326,10 +3309,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3340,7 +3323,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "parametre ''{0}'' zero (null) olamaz" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3494,10 +3477,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Hata: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3509,6 +3492,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3517,5 +3500,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3524,6 +3507,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3540,6 +3523,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "arkaplan" @@ -3557,19 +3540,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "Lambert Zone (Estonia)" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3583,26 +3583,51 @@ msgstr "Mercator" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +msgid "PUWG Zone" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3617,10 +3642,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "Tekrar Gösterme" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3628,32 +3653,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "eksik" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "Karayolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "demiryolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "suyolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "arazi kullanımı" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3661,5 +3686,5 @@ msgstr[0] "{0} Kavşak" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3696,6 +3721,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "Çelişki" @@ -3705,11 +3730,11 @@ msgstr "Tanımsız host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3914,11 +3939,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4033,5 +4058,5 @@ msgstr "Yeni yol segmentinin uzunluğu çizildi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4039,18 +4064,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(obje yok)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "tabaka listede yok." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4171,67 +4196,67 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Üyeler" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 +#, java-format +msgid "Tags({0} conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format -msgid "Tags({0} conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 -#, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4239,68 +4264,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4308,5 +4333,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4314,30 +4339,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4345,5 +4370,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4351,14 +4376,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4366,5 +4391,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4372,54 +4397,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "Çıkart" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4428,5 +4453,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4435,5 +4460,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4442,5 +4467,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4449,5 +4474,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4456,6 +4481,6 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4464,6 +4489,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4474,5 +4499,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "" @@ -4484,5 +4509,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4491,19 +4516,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4512,9 +4537,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4524,5 +4549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4546,84 +4571,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "silindi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +msgid "visible (on the server)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 msgid "not visible (on the server)" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +msgid "Keep a clone of the local version" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4633,17 +4658,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4652,9 +4677,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4669,19 +4694,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4697,10 +4722,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4710,10 +4735,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4740,27 +4765,27 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 +msgid ">" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +msgid "Keep the selected key/value pairs from the local dataset" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 -msgid ">" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 -msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +msgid "Undecide" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 -msgid "Undecide" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4785,22 +4810,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4808,5 +4833,5 @@ msgstr "boş" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4897,6 +4922,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4906,5 +4931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4917,21 +4942,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4939,5 +4964,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5024,10 +5049,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5047,17 +5072,17 @@ msgstr "Komut Yığını: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "Çözümle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "Seçili nesneler için birleştime penceresi aç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5066,25 +5091,25 @@ msgstr "Haritada seçili elemanları listedede seç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +msgid "Close anyway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 +msgid "Continue resolving" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 #, java-format msgid "" @@ -5096,13 +5121,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5114,8 +5139,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5182,5 +5207,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5212,34 +5237,34 @@ msgstr "Yüklenilmiş olan tabakaların listesini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "Seçili tabakayı sil." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "Göster/Sakla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "Seçili tabakanın görünen kısmını sabitle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "Seçili tabakayı bir satır yukarı taşı." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "Seçili tabakayı bir satır aşağı taşı." @@ -5249,17 +5274,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "İşlem {0} objeyi değiştirecek." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "Boş değer anahtarı sildi." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5268,10 +5293,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "Değerleri Değiştir?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5279,5 +5304,5 @@ msgstr[0] "Değerleri {0} obje için değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5285,9 +5310,9 @@ msgstr[0] "İşlem {0} objeyi değiştirecek." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "Lütfen bir anahtar seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "Lütfen bir değer seçiniz" @@ -5311,102 +5336,98 @@ msgstr "Üyesi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "Özellik Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "Özellik: {0} / Üyelik: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "Özellik / Üyelik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "İlişkiyi değiştir" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "Seçili anahtarı her objeden sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "Özelliği Sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "Özellikleri Değiştir" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "Seçili anahtarın değerini her obje için düzenle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "Özellik: {0} / Üyelik: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "Özellik / Üyelik" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "İlişkiyi değiştir" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "Seçili anahtarı her objeden sil" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "Özelliği Sil" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "İlişkiler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "İlişkilerin listesini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "İlişkiler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "Seçili ilişki için bir editör aç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "Seçili ilişkiyi sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "Yeni ilişki oluştur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5435,5 +5456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5445,14 +5466,14 @@ msgstr "Seçim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "Panelin kilidini Kaldır" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "paneli büyütüp/küçültmek için tıklayınız" @@ -5533,12 +5554,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5556,5 +5577,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5562,5 +5583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5568,18 +5589,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5588,14 +5609,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5605,9 +5626,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5617,15 +5638,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5633,5 +5654,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5639,20 +5660,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5661,66 +5682,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "Seçili üyeyi yukarı taşı" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "Seçili üyeyi aşağı taşı" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5729,9 +5750,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5740,41 +5761,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5784,19 +5805,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "Bilgi İndiriliyor" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5817,10 +5845,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5834,5 +5858,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5902,9 +5926,9 @@ msgstr "Sık Kullanılanlar" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5913,52 +5937,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "min lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "min lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "max lat" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "max lon" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5966,52 +5990,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "Sınır Çerçevesi" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "Bilgi Kaynağı ve Tipi" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap verisi" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "Ham GPS verisi" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "Yeni tabaka olarak indir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6019,38 +6043,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "Alanı indir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "İndir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "Seçilen alan çok büyük; server iptal edecektir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "Seçilen alan uygun, server kabul edecektir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6072,21 +6096,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6825,8 +6849,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -6999,5 +7023,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7009,5 +7033,5 @@ msgstr "Tip" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7054,5 +7078,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7066,5 +7090,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7075,5 +7099,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7082,19 +7106,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7104,32 +7128,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7151,5 +7175,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7211,7 +7235,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "parametre ''{0}'' zero (null) olamaz" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 @@ -7241,33 +7265,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 +#, java-format +msgid "Node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 +msgid "Zoom to this node in the current data layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 +msgid "Open a history browser with the history of this node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 +#, java-format +msgid "Way {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 -#, java-format -msgid "Node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "Probleme Yaklaş" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 -msgid "Zoom to this node in the current data layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "tarih" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 -msgid "Open a history browser with the history of this node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 -#, java-format -msgid "Way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 #, java-format msgid "Relation {0}" @@ -7276,7 +7298,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "kuzeydoğu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7294,7 +7315,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7334,7 +7354,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "Anonymous" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7362,12 +7381,11 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "Sürüm {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "silindi" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 @@ -7425,10 +7443,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7639,5 +7657,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7660,17 +7678,17 @@ msgstr "Tabaka" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7686,7 +7704,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7729,29 +7747,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7759,38 +7777,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7798,16 +7816,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7851,24 +7869,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "{0} için görüntüler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "GPX Oku..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Noktalrı için {0} x {1} zaman yok" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Zaman şu noktalar \"{0}\" {1} x {2} için okunamadı" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7876,33 +7894,33 @@ msgstr "{0} Okunuyor..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "Zaman damgası okunabilen bir görüntü bulunamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "Geotagged Görüntüler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS başlangıç: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS bitiş: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "şu anki delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "zaman dilimi farkı: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7910,14 +7928,14 @@ msgstr[0] "görüntü" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} izde var." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "Saati eşle" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7925,32 +7943,32 @@ msgstr "JPEG görüntüsü (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "EXIF zamanı \"{0}\" dosyasında yok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "Görüntü" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPS ünitesi zamandilimi (resim farkı)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "Girilen zaman ayrıştırılamadı." @@ -8040,5 +8058,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8088,10 +8106,10 @@ msgstr[0] "{0} yol noktaları" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "Bilgi tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8101,11 +8119,11 @@ "yüklemek isterseniz buraya bakınız:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8115,29 +8133,29 @@ msgstr "Çevrildiği yer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "OSM den bu izi indir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "Bunun içindeki herşeyi indir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} metre" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "Her istek için max. alan:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8148,9 +8166,9 @@ "istiyor musunuz?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8158,5 +8176,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8165,23 +8183,23 @@ "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "indirilen alanın dışında" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8190,5 +8208,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8202,5 +8220,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8213,11 +8231,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8226,22 +8244,34 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} şunları içerir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "GPX tabakasına çevir" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +msgid "No problems found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8330,9 +8360,9 @@ msgstr "Sesi işaretleyecek herhangi bir nesne yok." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "Göster/Sakla Metin/İkon" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "Görünen metin ve ikonları sabitle." @@ -8396,5 +8426,5 @@ msgstr "Varsayılan değer bilinmiyor (ayar henuz kullanılmadı)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8402,5 +8432,5 @@ msgstr "Editlemek için bir satır seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8408,5 +8438,5 @@ msgstr "{0} için yeni değer" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8415,5 +8445,5 @@ msgstr "Silmek için bir satır seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "Yeni bir anahtar/değer çifti gir" @@ -8541,40 +8571,40 @@ msgstr "Ses kayıt cihazı kalibrasyonu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "Renk" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "Boya Stili {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "Seç" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "{0} için bir renk seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "JOSM da farklı objlerin kullandığı renkler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "Renkler" @@ -9007,17 +9037,17 @@ msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "koordinatları şu şekilde göster" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "Projeksiyon türü" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9027,5 +9057,5 @@ msgstr "Harita Projeksiyonu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9083,81 +9113,81 @@ msgstr "Kısayol" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9166,6 +9196,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9346,10 +9376,10 @@ msgstr "Düzenleyici Grupları" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9359,13 +9389,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9373,18 +9403,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "Seçilebilen Özellikler:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9395,15 +9425,15 @@ msgstr "Etiketteki özellikler okunamadı: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "İşleme Hatası {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9412,18 +9442,18 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "Özellikleri Değiştir" @@ -9439,6 +9469,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9447,8 +9477,21 @@ msgstr "OSM Server'ına Bağlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "{0} ve {1} arası bilgiler indiriliyor" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "" #. SAXException does not chain correctly @@ -9565,11 +9608,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9579,40 +9622,40 @@ msgstr "OSM bilgisi indiriliyor..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9675,5 +9718,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9686,66 +9729,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "Kapanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "Hazırlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "Yükleniyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9780,5 +9823,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9805,5 +9848,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9811,5 +9854,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9822,5 +9865,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9971,5 +10014,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9978,38 +10021,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10017,19 +10060,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "Ref=0, eksik tanımı." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "Geçersiz obje bulundu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10039,10 +10082,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10052,25 +10093,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10532,5 +10573,5 @@ msgstr "(Metin zaten panoda mevcut.)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10539,12 +10580,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10554,5 +10588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10562,10 +10596,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10574,5 +10603,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10581,5 +10610,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10588,9 +10617,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10600,5 +10636,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10607,5 +10643,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10614,5 +10650,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10621,10 +10657,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10633,10 +10669,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10647,5 +10683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10655,5 +10691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11380,5 +11416,5 @@ msgstr "Dosyada Hata {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11391,28 +11427,45 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "Dosya Yüklemede Sorun" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, java-format +msgid "Lambert Zone {0} cache file (.{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "" @@ -11442,13 +11495,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11457,13 +11510,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11743,43 +11796,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11787,5 +11845,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "" @@ -11815,5 +11873,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "WMS ayarla" @@ -11841,5 +11899,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11847,28 +11905,28 @@ msgstr "Boş Tabaka" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 +msgid "Is not vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 -msgid "Is not vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 #, java-format msgid "Raster size: {0}" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 +msgid "Is vectorized." +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 -msgid "Is vectorized." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11877,24 +11935,15 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" msgstr "" @@ -12937,20 +12986,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "Buna izin veriyormusunuz?" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "uzak kontrol haereketini onayla" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:" @@ -13072,13 +13121,9 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "" @@ -13653,6 +13698,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "Sırasız sahil çizgisi" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14303,12 +14349,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "İndir" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "Harita verisi OSM sunucusundan indir." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14346,7 +14390,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "Çift noktalar kaldırılıyor..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14412,29 +14455,29 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14443,5 +14486,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14449,10 +14492,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14465,24 +14508,24 @@ msgstr "Otomatik indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS tabakası ({0}), görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14493,13 +14536,13 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14508,44 +14551,49 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "WMS tabakasını dosyaya kaydet" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "WMS tabakasını dosyadan yükle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "Dosya Format Hatası" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "Sık Kullanılanlar" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26859,8 +26907,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "nadir etiket kombinasyonu" @@ -26880,34 +26927,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPE Haritası" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26917,9 +26953,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Streets NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26933,22 +26972,73 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "help" -#~ msgstr "yardım" - -#~ msgid "Help / About" -#~ msgstr "Yardım / Hakkında" - -#~ msgid "WMS Plugin Help" -#~ msgstr "WMS Eklenti Yardımı" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPE Haritası" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Edit Properties" +#~ msgstr "Özellikleri Değiştir" #~ msgid "" @@ -27306,4 +27396,10 @@ #~ msgid "Please select the row to copy." #~ msgstr "Kopyalamak için bir satır seçiniz." + +#~ msgid "help" +#~ msgstr "yardım" + +#~ msgid "Help / About" +#~ msgstr "Yardım / Hakkında" #~ msgid "" @@ -27354,4 +27450,7 @@ #~ "format=image/png" +#~ msgid "WMS Plugin Help" +#~ msgstr "WMS Eklenti Yardımı" + #~ msgid "Navigation" #~ msgstr "Navigasyon" Index: applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- applications/editors/josm/i18n/po/zh_TW.po (revision 18772) +++ applications/editors/josm/i18n/po/zh_TW.po (revision 18773) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-08 13:58+0000\n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-24 06:12+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:05+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" @@ -28,20 +28,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "說明" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "忽略不正確的 URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -62,21 +62,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -84,6 +82,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -95,12 +93,21 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "忽略格式不良的檔案 URL： \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "無法讀取檔案「{0}」。
錯誤為：
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -108,17 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "錯誤" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -300,8 +301,8 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 msgid "Continue" -msgstr "" +msgstr "繼續" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -310,27 +311,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -348,5 +349,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "取消" @@ -356,28 +357,28 @@ msgstr "請至少選擇一個已上傳的節點、路徑或關係。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." -msgstr "" +msgstr "請選擇目標圖層。" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 +msgid "Select target layer" +msgstr "選擇目標圖層" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 -msgid "Select target layer" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgstr "合併" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" "There are no layers the source layer
''{0}''
could be merged to." "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +msgstr "來源圖層
''{0}''
中沒有任何圖層可合併。" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" -msgstr "" +msgstr "沒有目標圖層" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 @@ -488,13 +489,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -592,20 +593,20 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "檔案: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -641,10 +642,10 @@ msgstr "不能組合路徑（它們無法合併為節點的單一字串）" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "組合 {0} 條路徑" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "請選擇至少兩個以上的路徑來合併" @@ -675,5 +676,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 msgid "Those nodes are not in a circle. Aborting." -msgstr "" +msgstr "這些節點不在一個圓上。正在中止。" #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268 @@ -688,10 +689,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -710,11 +711,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "覆寫" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "檔案已存在，要覆蓋嗎?" @@ -743,5 +744,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 msgid "Download parent ways/relations..." -msgstr "" +msgstr "下載上層路徑/關係..." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40 @@ -753,5 +754,5 @@ #, java-format msgid "Id > 0 required, got {0}" -msgstr "" +msgstr "需要 Id > 0，卻收到 {0}" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89 @@ -761,5 +762,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -768,6 +769,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -779,11 +780,10 @@ #, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "" +msgstr "參數「{0}」不能為 null" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -792,24 +792,24 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231 msgid "Conflicts during download" -msgstr "" +msgstr "下載時遇到衝突" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256 #, java-format msgid "({0}/{1}) Loading parents of node {2}" -msgstr "" +msgstr "({0}/{1}) 正在載入節點 {2} 的上層項目" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257 #, java-format msgid "({0}/{1}) Loading parents of way {2}" -msgstr "" +msgstr "({0}/{1}) 正在載入路徑 {2} 的上層項目" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258 #, java-format msgid "({0}/{1}) Loading parents of relation {2}" -msgstr "" +msgstr "({0}/{1}) 正在載入關係 {2} 的上層項目" #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "重製" @@ -833,30 +833,30 @@ msgstr "離開程式" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" -msgstr "" - +msgstr "所有的格式" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "匯出到 GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "匯出資料到 GPX 檔案" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "沒有東西可匯出。請先取得一些資料。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -864,13 +864,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -889,8 +889,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -898,7 +898,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -921,9 +921,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -935,5 +935,5 @@ msgstr "參數「{0}」必須不為空值(null)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -941,12 +941,12 @@ msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" -msgstr "" +msgstr "匯出 GPX 檔案" #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19 msgid "Object history" -msgstr "" +msgstr "物件歷史紀錄" #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17 @@ -982,9 +982,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" -msgstr "" +msgstr "合併圖層" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge the current layer into another layer" -msgstr "" +msgstr "將目前的圖層合併到另一個圖層" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 @@ -1003,5 +1003,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152 msgid "Abort Merging" -msgstr "" +msgstr "放棄合併" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 @@ -1013,5 +1013,5 @@ msgid "" "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." -msgstr "" +msgstr "不能合併節點：必須刪除仍在使用中的路徑「{0}」。" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264 @@ -1023,5 +1023,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 msgid "Merge selection" -msgstr "" +msgstr "合併選擇區域" #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 @@ -1085,6 +1085,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "新增" @@ -1105,10 +1105,10 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69 msgid "Opening files" -msgstr "" +msgstr "正在開啟檔案" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88 #, java-format msgid "Opening file ''{0}'' ..." -msgstr "" +msgstr "正在開啟檔案「{0}」..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39 @@ -1127,5 +1127,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70 msgid "Select if the data should be downloaded in a new layer" -msgstr "" +msgstr "如果資料要下載到新的圖層裡請選擇此項" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77 @@ -1135,5 +1135,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79 msgid "Enter an URL from where data should be downloaded" -msgstr "" +msgstr "輸入用來下載資料的 URL" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88 @@ -1147,13 +1147,13 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94 msgid "Start downloading data" -msgstr "" +msgstr "開始下載資料" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95 msgid "Close dialog and cancel downloading" -msgstr "" +msgstr "關閉對話盒並取消下載" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109 msgid "Download Data" -msgstr "" +msgstr "下載資料" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44 @@ -1201,5 +1201,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174 msgid "Usage" -msgstr "" +msgstr "用量" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175 @@ -1213,5 +1213,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "貼上" @@ -1278,5 +1278,5 @@ #, java-format msgid "Could not rename file ''{0}''" -msgstr "" +msgstr "無法重新命名檔案「{0}」" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 @@ -1299,11 +1299,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "存檔" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "儲存現在的資料" @@ -1316,5 +1316,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 msgid "No Exporter found! Nothing saved." -msgstr "" +msgstr "找不到匯出程式！沒有儲存任何東西。" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 @@ -1358,10 +1358,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "另存檔案..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "將目前的資料儲存為新的檔案。" @@ -1378,29 +1378,29 @@ msgstr "選擇資料圖層中所有取消刪除的物件。這樣也會選擇不完整的物件。" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "顯示狀態報告" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "顯示有與程式錯誤相關資訊的狀態報告" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "求助：{0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "狀態報告" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "複製到剪貼簿並關閉" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1466,4 +1466,6 @@ "this and correct it when necessary." msgstr "" +"將關係成員複製到所有的新路徑。
您應該在You should verify this and " +"correct it when necessary." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358 @@ -1552,5 +1554,5 @@ msgstr "取消黏合節點" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1558,5 +1560,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1594,71 +1596,68 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26 msgid "Update data" -msgstr "" +msgstr "更新資料" #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24 msgid "Updates the objects in the active data layer from the server." -msgstr "" +msgstr "從伺服器更新使用中資料圖層的物件。" #. bounds defined? => use the bbox downloader #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +msgstr "下載資料" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +msgstr "找不到目前的資料組合" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +msgstr "在目前的資料組合中找不到 id {0} 的物件" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" msgstr "更新選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +msgstr "從伺服器更新目前選取的物件（重新下載資料）" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "更新選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "複製選取的物件到剪貼簿" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "沒有選取的物件需要更新。" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "選擇區域是空的" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "更新選擇區域" - +msgstr "更新物件" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +msgstr "上傳資料" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +msgstr "將使用中圖層的所有變更上傳至 OSM 伺服器" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" "There are unresolved conflicts in layer ''{0}''.
You have to " "resolve them first." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +msgstr "在圖層「{0}」中有未解決的衝突。
您必須先解決它們。" + +#: ../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 @@ -1666,29 +1665,29 @@ msgstr "沒有要上傳的變更。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "沒有要上傳的項目。請先取得一些資料。" +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#, java-format +msgid "Synchronize node {0} only" +msgstr "只同步節點 {0}" + #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format -msgid "Synchronize node {0} only" -msgstr "" +msgid "Synchronize way {0} only" +msgstr "只同步路徑 {0}" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format -msgid "Synchronize way {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 -#, java-format msgid "Synchronize relation {0} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +msgstr "只同步關係 {0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "同步整個資料組" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1702,11 +1701,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +msgstr "選取的衝突" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1720,5 +1719,5 @@ "{1}則會放棄並繼續編輯。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1727,23 +1726,25 @@ "again with a new or an existing open changeset." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +"上傳 失敗，因為您使用的
變更組合 {0} 已經在 {1} 被" +"關閉了。
請以新的或已開啟的變更組合再上傳一次。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" -msgstr "" +msgstr "變更組合已關閉" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 +msgid "Prepare conflict resolution" +msgstr "準備衝突的調解" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 -msgid "Prepare conflict resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 #, java-format msgid "Click to download all parent ways for node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +msgstr "點選以下載節點 {0} 的所有上層路徑" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +msgstr "點選以取消或恢復編輯地圖" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1753,27 +1754,30 @@ "conflicts which you can resolve in the Conflict Resolution Dialog." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +"上傳 已失敗，因為您嘗試刪除的節點 {0} 仍被路徑 {1} 使" +"用中。

請點選 {2} 以下載節點 {0} 的所有上層路徑。
" +"如果有需要 JOSM 會建立衝突項目讓您可以在衝突解決對話盒中處理它。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +msgstr "節點仍在使用中" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +msgstr "警告：錯誤標頭「{0}」與預期的模式不符" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" -msgstr "" +msgstr "上傳圖層「{0}」的資料" #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1782,15 +1786,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1803,18 +1807,18 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47 msgid "Upload all changes in the current selection to the OSM server." -msgstr "" +msgstr "將目前的選擇區域上傳至 OSM 伺服器。" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259 msgid "Checking parents for deleted objects" -msgstr "" +msgstr "正在檢查被刪除物件的上層項目" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318 #, java-format msgid "Reading parents of ''{0}''" -msgstr "" +msgstr "正在讀取「{0}」的上層項目" #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324 msgid "Checking for deleted parents in the local dataset" -msgstr "" +msgstr "正在檢查在本地端資料組合中被刪除的上層項目" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -1902,25 +1906,25 @@ msgstr "慢速快轉" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "正在下載 GPS 資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "已下載的 GPX 資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "正在下載資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" "Ignoring exception because download has been cancelled. Exception was: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +msgstr "忽略的例外，因為下載已被取消。例外為：{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." -msgstr "" +msgstr "在這個區域中找不到資料。" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66 @@ -1931,9 +1935,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87 msgid "Updating data" -msgstr "" +msgstr "正在更新資料" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157 msgid "Check on the server" -msgstr "" +msgstr "檢查伺服器" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159 @@ -1941,5 +1945,5 @@ "Click to check whether objects in your local dataset are deleted on the " "server" -msgstr "" +msgstr "點選以檢查在您本地端資料組合中的物件是否在伺服器中已被刪除" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163 @@ -1950,5 +1954,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165 msgid "Click to abort and to resume editing" -msgstr "" +msgstr "點選以放棄或恢復編輯" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170 @@ -1969,14 +1973,14 @@ #, java-format msgid "The following errors occurred during mass download: {0}" -msgstr "" +msgstr "在大量下載時發生下列錯誤：{0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "下載時發生錯誤" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" -msgstr "" +msgstr "下載時發生錯誤" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92 @@ -1992,5 +1996,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1998,5 +2002,5 @@ msgstr "模式：{0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2092,7 +2096,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "繪出想要尺寸的矩形，然後放開滑鼠按鈕。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2101,9 +2104,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "拖曳路徑區段以產生矩形。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2116,5 +2118,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2133,17 +2135,17 @@ msgstr[0] "加入並移動虛擬新節點至{0}路徑" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 +msgid "Move elements" +msgstr "移動元素" + #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +msgstr "移動它們" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +msgstr "取消移動" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2152,23 +2154,25 @@ "Really move them?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +"您已經移動超過 {0} 個元素。移動大量的元素通常是因為錯誤而造成的。\n" +"真的要移動它們嗎？" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +msgstr "永遠進行移動而不要顯示這個對話盒" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "放開滑鼠按鈕以選擇矩形內的物件。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "放開滑鼠按鈕以停止旋轉。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2178,15 +2182,15 @@ "或改變選擇區域" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "縮放" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "縮紋並移動地圖" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2196,10 +2200,10 @@ "動縮放" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "搜尋..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2208,58 +2212,57 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgstr "請輸入過濾條件字串。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "請輸入搜尋字串。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "正規表示式" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "請輸入搜尋語詞" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "取代選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "加入至選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "從選擇區域移除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgstr "在選擇區域中尋找" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "區分大小寫" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "正規表示式" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 「Baker」和「Street」出現在何設定鍵或名稱中。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 「Baker Street」出現在何設定鍵或名稱中。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 「Bak」出現在名稱中的任何地方。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - 含有設定鍵「type」為「route」者。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2269,17 +2272,17 @@ "type=、*=*、*=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - 名稱中沒有「Bak」。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot 設定為任何數值。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "特殊的目標：" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 msgid "" "type: - type of the object (node, way, relation)" @@ -2288,61 +2291,61 @@ "(relation))" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 msgid "user:... - all objects changed by user" msgstr "使用者：... - 所有由某使用者改變的物件" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 +msgid "id:... - object with given ID (0 for new objects)" +msgstr "id:... - 以此為 ID 的物件 (0 為新的物件)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 -msgid "id:... - object with given ID (0 for new objects)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "nodes:... - object with given number of nodes" msgstr "節點數：... - 含有此數目節點的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" "max)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +msgstr "tags:... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "修改過 - 所有改變過的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 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:131 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:132 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:133 msgid "" "child expr - all children of objects matching the expression" msgstr "child expr - 所有物件的子項符合正規表示式的" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent expr - 所有物件父項符合正規表示式的" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "使用 | 或 OR 做邏輯或運算" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "使用 \" 將運算子包覆 (例如當設定鍵含有 :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "使用 ( 和 ) 將正規表示式群組起來" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2352,51 +2355,51 @@ msgstr "過濾條件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "搜尋" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +msgstr "送出過濾條件" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "開始搜尋" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "找不到「{0}」的符合項" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +msgstr "在選擇區域中搜尋不到「{0}」" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "找到 {0} 個符合項" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2413,40 +2416,40 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "未預期的記號：{0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "沒有 or 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "沒有 not 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "需要關閉括弧。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2455,9 +2458,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "給 nodes 運算子錯誤的參數數量。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2468,5 +2471,5 @@ "nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2564,7 +2567,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2580,65 +2583,65 @@ #, java-format msgid "Add node {0}" -msgstr "" +msgstr "加入節點 {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 #, java-format msgid "Add way {0}" -msgstr "" +msgstr "加入路徑 {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 #, java-format msgid "Add relation {0}" -msgstr "" +msgstr "加入關係 {0}" #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49 #, java-format msgid "Added {0} objects" -msgstr "" +msgstr "已加入 {0} 物件" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 #, java-format msgid "Change node {0}" -msgstr "" +msgstr "改變節點 {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 #, java-format msgid "Change way {0}" -msgstr "" +msgstr "改變路徑 {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 #, java-format msgid "Change relation {0}" -msgstr "" +msgstr "改變關係 {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 #, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "" +msgstr "從節點「{1}」移除「{0}」" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 #, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "" +msgstr "從路徑「{1}」移除「{0}」" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 #, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "" +msgstr "從關係「{1}」移除「{0}」" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 #, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "" +msgstr "在節點「{2}」設定 {0}={1}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 #, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "" +msgstr "在路徑「{2}」設定 {0}={1}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 #, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "" +msgstr "在關係「{2}」設定 {0}={1}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2673,7 +2676,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" -msgstr "" +msgstr "雙重衝突" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 @@ -2687,5 +2690,5 @@ #, java-format msgid "Add conflict for ''{0}''" -msgstr "" +msgstr "加入「{0}」衝突" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 @@ -2694,7 +2697,7 @@ msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +msgstr "不能復原「{0}」指令，因為圖層「{1}」已不存在" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2702,6 +2705,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "不能未決定的衝突" @@ -2711,13 +2714,13 @@ #, java-format msgid "Parameter ''{0}'' must not be empty" -msgstr "" +msgstr "參數「{0}」不能空白" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60 msgid "At least one object to delete required, got empty collection" -msgstr "" +msgstr "至少要刪除一個物件，卻收到空白集合" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106 msgid "At least one object to delete requird, got empty collection" -msgstr "" +msgstr "至少要刪除一個物件，卻收到空白集合" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 @@ -2725,6 +2728,5 @@ msgid "Delete {0} object" msgid_plural "Delete {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "刪除 {0} 個物件" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183 @@ -2732,6 +2734,5 @@ msgid "Delete {0} node" msgid_plural "Delete {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "刪除 {0} 個節點" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184 @@ -2739,6 +2740,5 @@ msgid "Delete {0} way" msgid_plural "Delete {0} ways" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "刪除 {0} 個路徑" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185 @@ -2746,6 +2746,5 @@ msgid "Delete {0} relation" msgid_plural "Delete {0} relations" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "刪除 {0} 個關係" #. FIXME: relation memberships are not handled @@ -2768,37 +2767,26 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462 msgid "Delete confirmation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +msgstr "刪除動作確認" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "解決 {0} 刪除狀態的衝突" -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" - #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 #, java-format msgid "Move {0} node" msgid_plural "Move {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "移動 {0} 個節點" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 #, java-format msgid "Purged object ''{0}''" -msgstr "" +msgstr "清理的物件「{0}」" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 #, java-format msgid "Purged {0} objects" -msgstr "" +msgstr "清理的 {0} 物件" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2812,12 +2800,12 @@ #, java-format msgid "Removing reference from relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +msgstr "從關係 {0} 移除參考" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "解決關係 {0} 的成員清單的衝突" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2850,20 +2838,20 @@ msgstr "次序" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2885,10 +2873,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -2932,5 +2920,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "新的數值" @@ -2977,7 +2965,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "參數「{0}」應為 > 0，得到「{1}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -2986,10 +2974,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "設定檔案第 {0} 行格式不良" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -2998,5 +2986,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3005,5 +2993,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3012,5 +3000,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3019,5 +3007,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3025,5 +3013,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3032,5 +3020,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3039,5 +3027,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3046,5 +3034,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3053,10 +3041,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3137,25 +3125,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "南" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "北" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "西" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3163,5 +3151,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" @@ -3169,5 +3157,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3177,26 +3165,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "沒有 not 所需的引數。" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3205,5 +3193,5 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 #, java-format msgid "" @@ -3266,24 +3254,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3291,5 +3279,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3317,10 +3305,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3331,7 +3319,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "參數「{0}」應為 > 0，得到「{1}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3485,10 +3473,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "錯誤：{0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3500,6 +3488,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3508,5 +3496,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3515,6 +3503,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3531,6 +3519,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "背景" @@ -3548,24 +3536,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"重要：資料的位置已遠遠偏離目前\n" -"Lambert zone 的限制。\n" -"看到此訊息後不要上傳任何資料。\n" -"復原您最後的動作，儲存您的成果\n" -"並在新的區域開啟新的圖層。" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "蘭勃特區" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3579,26 +3579,52 @@ msgstr "麥卡托投影" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "區域" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +msgid "Guadeloupe Fort-Marigot 1949" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +msgid "Guadeloupe Ste-Anne 1948" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +msgid "Martinique Fort Desaix 1952" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" msgstr "" @@ -3613,10 +3639,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "不再顯示" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3624,32 +3650,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "不完整" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "公路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "鐵路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "航道" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "土地利用" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3657,5 +3683,5 @@ msgstr[0] "{0} 節點" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3692,6 +3718,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "衝突" @@ -3701,11 +3727,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3907,11 +3933,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4026,5 +4052,5 @@ msgstr "繪出新的路徑區段的長度。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4032,18 +4058,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(沒有物件)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "圖層不在清單中。" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4164,67 +4190,67 @@ msgstr "角色 {0} 沒有參與比較配對 {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "屬性" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "標籤" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "節點" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "成員" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "沒有待解決的標籤衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "標籤({0} 衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} 個標籤衝突待解決" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "節點(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "節點(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "這個路徑的節點清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "成員(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4232,68 +4258,68 @@ msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "成員(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "這個關係的成員清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "屬性(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "待解決的屬性衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "衝突的決議" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "參數目前超出範圍：得到 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "角色 {0} 中的清單目前沒有參與比較配對" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "參數「index」有未預期的數值。得到 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "在清單中找不到項目 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "鎖定捲動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "比較 " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "我的版本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "我的資料組合裡元件的清單，例如本地端資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4301,5 +4327,5 @@ msgstr "合併的版本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4307,30 +4333,30 @@ msgstr "合併元件的清單。它們會在合併決定被接受時取代我的元件。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "他們的版本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "他們的資料組合裡元件的清單，例如伺服器資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> 頂端" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "將我選取的節點複製到合併節點清單的開頭" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> 底部" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "將我選取的元件複製到合併元件清單的結尾" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4338,5 +4364,5 @@ msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之前" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4344,14 +4370,14 @@ msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之後" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "將他們選取的元件複製到合併元件清單的開頭" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "將他們選取的元件複製到合併元件清單的結尾" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4359,5 +4385,5 @@ msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之前" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4365,54 +4391,54 @@ msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之後" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "上" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "將選取的元件向上移動一個位置" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "下" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "將選取的項目向下移動一個位置" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "移除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "從合併元件的清單移除選取的項目" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "凍結" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "凍結合併元件目前的清單" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "解除凍結" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "將合併元件的清單解除凍結並開始合併" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4421,5 +4447,5 @@ msgstr "點選 {0} 開始合併我和他們的項目" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4428,5 +4454,5 @@ msgstr "點選 {0} 結束合併我和他們的項目" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4434,5 +4460,5 @@ msgstr[0] "我的版本 ({0} 個項目)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4440,5 +4466,5 @@ msgstr[0] "合併的版本 ({0} 個項目)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4446,6 +4472,6 @@ msgstr[0] "他們的版本 ({0} 個項目)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4454,6 +4480,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4464,5 +4490,5 @@ msgstr "節點" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "合併的節點尚未凍結。不能建置決議指令" @@ -4474,5 +4500,5 @@ msgstr "未預期的欄位索引。得到 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4481,19 +4507,19 @@ msgstr "與伺服器溝通時發生錯誤
詳細資料：{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "與伺服器溝通失敗" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "是的，也取消它們的刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "不，取消操作" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4504,9 +4530,9 @@ "

是否要一併取消這些節點的刪除？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "取消刪除額外的節點？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4516,5 +4542,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "" @@ -4538,84 +4564,84 @@ msgstr "坐標：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "刪除的狀態：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "可視狀態：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "（沒有）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "已刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "未刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "可視的（在伺服器上）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "不可視（在伺服器上）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "保留本地端版本的複本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "實際從本地端資料組合中刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "保留我的坐標" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "保留他們的坐標" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "在不同的坐標之間未解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "保留我的刪除狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "保留他們的刪除狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "已刪除狀態之間未解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "保留我的可見性狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "是，重設 id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "否，中止" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4625,17 +4651,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "重設 id 為 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "保留他們的可見性" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "是，清除它" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4644,9 +4670,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "從資料組合移除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "" @@ -4661,19 +4687,19 @@ msgstr "合併的節點尚未凍結。不能建置決議指令" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<未定義的>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4689,10 +4715,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4702,10 +4728,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4732,27 +4758,27 @@ msgstr "他們的版本（伺服器資料組合）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "保留本地端資料組合中選取的設定鍵/數值配對" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "保留伺服器資料組合中選取的設定鍵/數值配對" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "未決定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "將選取的標籤標記為未決定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4777,22 +4803,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4800,5 +4826,5 @@ msgstr "沒有" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -4889,6 +4915,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -4898,5 +4924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -4909,21 +4935,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 +msgid "Undecided" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 -msgid "Undecided" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 msgid "Not decided yet" msgstr "" @@ -4931,5 +4957,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "" @@ -5016,10 +5042,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5039,17 +5065,17 @@ msgstr "指令堆疊：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "開啟上列清單所有選取的項目的合併對話盒。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5058,25 +5084,25 @@ msgstr "在地圖上設定選取的元件為上列清單中選取的項目。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "取消衝突決議並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "接受已解決的衝突並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "套用解決方案" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "繼續解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5088,13 +5114,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "解決衝突" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5106,8 +5132,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5174,5 +5200,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5204,34 +5230,34 @@ msgstr "開啟所有載入圖層的清單。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "刪除選取的圖層。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "顯示/隱藏" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "切換選取的圖層可見性狀態。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "將選取的圖層上移一列。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "將選取的圖層下移一列。" @@ -5241,17 +5267,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "這會改變 {0} 個物件。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "空白的數值會刪除該設定鍵。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5260,10 +5286,10 @@ msgstr "<不同>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "是否改變數值？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5271,5 +5297,5 @@ msgstr[0] "改變屬性至 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5277,9 +5303,9 @@ msgstr[0] "這會改變 {0} 個物件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "請選擇一個設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "請選擇一個數值" @@ -5303,102 +5329,98 @@ msgstr "成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "加入屬性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "屬性：{0} / 成員：{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "屬性 / 成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "改變關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "自關係中刪除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "確定要刪除關係 {0} 的選擇區域？" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "刪除所有物件中選取的設定鍵" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "删除屬性" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "將新的設定鍵/數值配對加入到所有的物件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "編輯屬性" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "編輯所有物件選取設定鍵的數值" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "屬性：{0} / 成員：{1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "屬性 / 成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "改變關係" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "自關係中刪除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "確定要刪除關係 {0} 的選擇區域？" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "刪除所有物件中選取的設定鍵" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "删除屬性" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "開啓所有關係的清單。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "關係：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "開啓選取的關係編輯器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "刪除選取的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "建立新的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" msgstr "" @@ -5427,5 +5449,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5437,14 +5459,14 @@ msgstr "選擇區域：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "解鎖面板" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "點選以最小化/最大化面板內容" @@ -5525,12 +5547,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "" @@ -5548,5 +5570,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5554,5 +5576,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5560,18 +5582,18 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 -msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5580,14 +5602,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5597,9 +5619,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5609,15 +5631,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5625,5 +5647,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5631,20 +5653,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5653,66 +5675,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "將目前選取的成員上移" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "將目前選取的成員下移" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 +msgid "Click to create a conflict and close this relation editor" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 -msgid "Yes, create a conflict and close" +msgid "No, continue editing" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 -msgid "Click to create a conflict and close this relation editor" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5721,9 +5743,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5732,41 +5754,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "下載關係中所有不完整的路徑和節點" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5776,19 +5798,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 +msgid "No, don't apply" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 -msgid "No, don't apply" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "正在下載外掛程式 {0}..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5809,10 +5838,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" msgstr "" @@ -5826,5 +5851,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -5894,9 +5919,9 @@ msgstr "書籤" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -5905,52 +5930,52 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "最小緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "最小經度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "最大緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "最大經度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -5958,52 +5983,52 @@ msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上 URL 下載該區域)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "綁定方塊" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "資料來源和類型" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMap 資料" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "原始 GPS 資料" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "下載為新圖層" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6011,38 +6036,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "下載區域" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "下載" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "下載區域太大；可能會被伺服器拒絕" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "下載區域確定，大小應該會被伺服器接受" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6064,21 +6089,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "空指標例外(Null pointer exception)，可能遺漏某些標籤。" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -6817,8 +6842,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -6991,5 +7016,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7001,5 +7026,5 @@ msgstr "類型" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7046,5 +7071,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7058,5 +7083,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7067,5 +7092,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7074,19 +7099,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7096,32 +7121,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7143,5 +7168,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "" @@ -7203,12 +7228,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "參數「{0}」應為 > 0，得到「{1}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "參數「{0}」應為 > 0，得到「{1}」" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7233,33 +7258,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "節點 {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "縮放至問題點" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "載入歷史紀錄" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7268,7 +7291,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "排序預設組合選單" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7286,7 +7308,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7314,8 +7335,8 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" -msgstr "點選 {0} 開始合併我和他們的項目" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 @@ -7326,7 +7347,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "匿名" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7354,17 +7374,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "版本 {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "已刪除" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "版本 {0} 由 {2} 建立於 {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7417,10 +7436,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "" @@ -7631,5 +7650,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7652,17 +7671,17 @@ msgstr "層級" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7678,7 +7697,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "" @@ -7721,29 +7740,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "上傳變更" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7751,38 +7770,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "提供關於您所上傳變更的簡短註解：" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7790,16 +7809,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7843,24 +7862,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "{0} 的圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "讀取 GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "點 {0} x {1} 沒有時刻" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "不能讀取點 {1} x {2} 的時刻「{0}」" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -7868,33 +7887,33 @@ msgstr "正在讀取 {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "找不到具可讀時刻戳記的圖片。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "有 Geotag 的圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS 開始：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS 結束：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "目前的差分： {0}秒" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "時區差異： " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -7902,14 +7921,14 @@ msgstr[0] "圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "{0} 在此軌跡中。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "同步時鐘" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7917,32 +7936,32 @@ msgstr "JPEG 圖片 (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "檔案「{0}」的日期無法解析。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "在檔案「{0}」中沒有 EXIF 時刻。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPS 單元時區 (不同於照片)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "與 GPS 單元同步時刻" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "輸入的時刻無法解析。" @@ -8032,5 +8051,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8080,10 +8099,10 @@ msgstr[0] "{0} 航點" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "轉換為資料圖層" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8093,11 +8112,11 @@ "軌跡，請看這裡：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8107,29 +8126,29 @@ msgstr "轉換自：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "從 OSM 沿這條軌跡下載" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "下載這裡面的每個物件：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} 公尺" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "每個要求最大區域：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} 平方公里" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8139,9 +8158,9 @@ "這個動作會發出 {0} 個
個別的下載要求。您是否希望
繼續？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8149,5 +8168,5 @@ msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8155,23 +8174,23 @@ msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "資料圖層 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "超出下載的區域" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "版本 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8180,5 +8199,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8192,5 +8211,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8203,11 +8222,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 #, java-format msgid "{0} deleted" @@ -8216,22 +8235,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0} 組成：" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "取消設定" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "API 版本： {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "轉換為 GPX 圖層" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "找不到「從」路徑。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8320,9 +8352,9 @@ msgstr "這個圖層中沒有既存的音效標記可位移。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "顯示/隱藏文字/圖示" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "切換標記文字和圖示的可見性狀態。" @@ -8384,5 +8416,5 @@ msgstr "預設數值目前不明（設定值尚未使用）。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8390,5 +8422,5 @@ msgstr "請選擇要編輯的列。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8396,5 +8428,5 @@ msgstr "{0} 的新數值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8403,5 +8435,5 @@ msgstr "請選擇要刪除的列。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "輸入新的設定鍵/數值配對" @@ -8524,40 +8556,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "顏色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "繪畫樣式 {0}：{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "圖層：{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "選擇" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "選擇 {0} 的顏色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "設為預設值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "全部設為預設值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "在 JOSM 中用於不同物件的顏色。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "顏色" @@ -8989,17 +9021,17 @@ msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "顯示坐標為" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "投影方法" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "" @@ -9009,5 +9041,5 @@ msgstr "地圖投影" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9065,81 +9097,81 @@ msgstr "捷徑鍵" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 +#, java-format +msgid "Author: {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format -msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 -#, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9148,6 +9180,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9322,10 +9354,10 @@ msgstr "修飾鍵群組" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9334,13 +9366,13 @@ msgstr[0] "移除 {0} 個物件之多的舊設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" @@ -9348,18 +9380,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "額外屬性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "封閉路徑" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "不明的類型：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9370,15 +9402,15 @@ msgstr "無法讀取標籤預設組合來源：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "分析 {0} 時發生錯誤： " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "類型 {0} 的元件已支援。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9387,18 +9419,18 @@ msgstr[0] "改變 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "尚未選擇！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "選擇區域不合適！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "套用預設組合" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "改變屬性" @@ -9414,6 +9446,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9422,8 +9454,21 @@ msgstr "正在連接 OSM 伺服器..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "正在下載點 {0} 到 {1}..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "伺服器回覆未預期的 id 格式，取得「{0}」" #. SAXException does not chain correctly @@ -9538,11 +9583,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9552,40 +9597,40 @@ msgstr "正在下載 OSM 資料..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "伺服器對 id {0} 傳回回應代碼 404。正在略過它。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9648,5 +9693,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9659,66 +9704,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "正在關閉資料組合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "沒有需要進行差異上傳的資料組合" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "正在準備..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "正在上傳..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9753,5 +9798,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -9778,5 +9823,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -9784,5 +9829,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -9795,5 +9840,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -9946,5 +9991,5 @@ msgstr "檔案「{0}」不存在" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -9953,38 +9998,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -9992,19 +10037,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "不完整的 > 規格，ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "不合法的物件，id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10014,10 +10059,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10027,25 +10070,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10498,5 +10541,5 @@ msgstr "（該文字已複製到您的剪貼簿中。）" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10505,12 +10548,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10520,5 +10556,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10528,10 +10564,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10540,5 +10571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10547,5 +10578,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10554,9 +10585,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10566,5 +10604,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10573,5 +10611,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10580,5 +10618,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10587,10 +10625,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10599,10 +10637,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10613,5 +10651,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10621,5 +10659,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11345,5 +11383,5 @@ msgstr "檔案 {0} 有錯誤" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11356,29 +11394,48 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "載入檔案有錯誤" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "蘭勃特區 1 快取檔案 (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "蘭勃特區 1 快取檔案 (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "蘭勃特區 2 快取檔案 (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "蘭勃特區 3 快取檔案 (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "蘭勃特區 4 快取檔案 (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11407,13 +11464,13 @@ msgstr "選擇自..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "自動來源" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11425,13 +11482,13 @@ "您是否想要回復以 F11 作為抓取動作？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "回復抓取捷徑鍵 F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM 已停止以便讓變更生效。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -11713,43 +11770,48 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "區域" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "蘭勃特區" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "從快取載入位置（只有在快取已啟用時）" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "改變位置" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "為下個要求設定新的位置" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "加入新的圖層" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "位置" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -11759,5 +11821,5 @@ "點。" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "加入新的圖層" @@ -11787,5 +11849,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "調整 WMS" @@ -11815,5 +11877,5 @@ "請先選擇它們中的一個，然後重試" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -11821,28 +11883,28 @@ msgstr "空白圖層" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMS 圖層 ({0})，已載入 {1} 個拼貼" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "並非向量化的。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "是向量化的。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -11853,25 +11915,16 @@ "建立一個新的。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "快取格式錯誤" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "快取蘭勃特區發生錯誤" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -12912,20 +12965,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "您是否要允許這個？" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "確認遠端控制動作" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "遠端控制被要求自下列 URL 匯入資料：" @@ -13047,13 +13100,9 @@ msgstr "減少縮放" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "清除拼貼快取" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "圖片 " @@ -13626,6 +13675,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "未排序的海岸線" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14270,12 +14320,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "下載" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "從 OSM 主機下載圖資" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14313,7 +14361,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "正在移除重複的節點..." +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14379,29 +14426,29 @@ msgstr "沒有有效的 WMS URL 或 id" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "調整選取的 WMS 圖層的位置" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14410,5 +14457,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14416,10 +14463,10 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14434,24 +14481,24 @@ msgstr "自動下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS 圖層 ({0})，於縮放 {1} 下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14462,57 +14509,62 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "要求的區域太大。請拉近一點，或是改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "下載可見的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "重新載入錯誤的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "透明色版" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "將 WMS 圖層儲存為檔案" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "儲存 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "從檔案載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "檔案格式錯誤" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "書籤" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -26842,8 +26894,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "" @@ -26863,34 +26914,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: +#: build/trans_wms.java:10 +msgid "Yahoo Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:11 +msgid "OpenStreetMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? +#: build/trans_wms.java:12 +msgid "OpenCycleMap" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:13 -msgid "Yahoo Sat" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 -msgid "OpenStreetMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 -msgid "OpenCycleMap" -msgstr "" - -#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 msgid "TilesAtHome" msgstr "" @@ -26900,9 +26940,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -26916,37 +26959,515 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "" -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "找不到最早的版本。歷史紀錄是空的。" - -#~ msgid "No latest version found. History is empty." -#~ msgstr "找不到最新的版本。歷史紀錄是空的。" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "蘭勃特區 2 快取檔案 (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "蘭勃特區 3 快取檔案 (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "蘭勃特區 4 快取檔案 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "蘭勃特區 2 快取檔案 (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "蘭勃特區 3 快取檔案 (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "蘭勃特區 4 快取檔案 (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "蘭勃特區 1 快取檔案 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "蘭勃特區 1 快取檔案 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "蘭勃特區 1 快取檔案 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "蘭勃特區 1 快取檔案 (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "蘭勃特區 1 快取檔案 (.1)" + +#~ msgid "null detected in node list" +#~ msgstr "在節點清單中偵測到 null" + +#~ msgid "unexpected null value for n.getEastNorth(). id of n is" +#~ msgstr "在 n.getEastNorth() 有未預期的空值(null)。n 的 id 為" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "重要：資料的位置已遠遠偏離目前\n" +#~ "Lambert zone 的限制。\n" +#~ "看到此訊息後不要上傳任何資料。\n" +#~ "復原您最後的動作，儲存您的成果\n" +#~ "並在新的區域開啟新的圖層。" + +#~ msgid "Edit Properties" +#~ msgstr "編輯屬性" + +#~ msgid "File could not be found." +#~ msgstr "找不到檔案" + +#~ msgid "Combine Anyway" +#~ msgstr "合併，不管怎樣" + +#~ msgid "Open in Browser" +#~ msgstr "在瀏覽器中打開" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSM 線上說明" + +#~ msgid "unnamed" +#~ msgstr "未命名的" + +#~ msgid "Unsaved Changes" +#~ msgstr "未儲存的變更" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "提示：部分變更來自上傳到伺服器的新資料。" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "節點中有部分(幾乎)在直線裡" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "是否組合有不同關係成員的路徑？" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？" + +#~ msgid "All the ways were empty" +#~ msgstr "所有的路徑都是空的" + +#~ msgid "Please select at least one task to download" +#~ msgstr "請選擇至少一項要下載的工作" + +#~ msgid "Can only edit help pages from JOSM Online Help" +#~ msgstr "只能在 JOSM 線上求助中編輯求助頁面" + +#~ msgid "Error while loading page {0}" +#~ msgstr "載入頁面 {0} 時發生錯誤" + +#~ msgid "History of Element" +#~ msgstr "元件歷史" + +#~ msgid "Merge Anyway" +#~ msgstr "強制合併" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "是否合併有不同成員的節點？" + +#~ msgid "Only two nodes allowed" +#~ msgstr "只允許兩個節點" + +#~ msgid "Please select one or more closed ways of at least four nodes." +#~ msgstr "請選擇一或多個至少有四個節點的封閉路徑。" + +#~ msgid "Only one node selected" +#~ msgstr "只選取一個節點" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "請選擇有近乎正確角度的路徑來做直角化。" + +#~ msgid "No document open so nothing to save." +#~ msgstr "尚未開啟文件故沒有可儲存的項目。" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。" + +#~ msgid "Unknown file extension." +#~ msgstr "不明的延伸檔名。" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？" + +#~ msgid "Update Data" +#~ msgstr "更新資料" + +#~ msgid "Update failed" +#~ msgstr "更新失敗" + +#~ msgid "Upload to OSM..." +#~ msgstr "上傳至 OSM..." + +#~ msgid "Conflict detected" +#~ msgstr "偵測到衝突" + +#~ msgid "Upload to OSM API failed" +#~ msgstr "上傳至 OSM API 失敗" + +#~ msgid "No data imported." +#~ msgstr "沒有匯入資料。" + +#~ msgid "Data Layer" +#~ msgstr "資料圖層" + +#~ msgid "Delete {1} {0}" +#~ msgstr "刪除 {1} {0}" + +#~ msgid "Conflicting relation" +#~ msgstr "衝突的關係" + +#~ msgid "Move" +#~ msgstr "移動" + +#~ msgid "nodes" +#~ msgstr "節點" + +#~ msgid "ways" +#~ msgstr "路徑" + +#~ msgid "relations" +#~ msgstr "關係" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "File not found" +#~ msgstr "找不到檔案" + +#~ msgid "Merging conflicts." +#~ msgstr "正在合併衝突。" + +#~ msgid "Conflicts: {0}" +#~ msgstr "衝突： {0}" + +#~ msgid "Layers: {0}" +#~ msgstr "圖層：{0}" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "標籤 (數值留空會刪除該標籤)" + +#~ msgid "Move Up" +#~ msgstr "上移" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "將所有目前選取的物件加入為成員" + +#~ msgid "Move Down" +#~ msgstr "下移" + +#~ msgid "There were conflicts during import." +#~ msgstr "匯入時有衝突項目。" + +#~ msgid "Cannot read place search results from server" +#~ msgstr "不能從伺服器讀取位置搜尋結果" + +#~ msgid "name" +#~ msgstr "名稱" + +#~ msgid "zoom" +#~ msgstr "縮放" + +#~ msgid "Public" +#~ msgstr "公開" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "不能開啓偏好設定目錄：{0}" + +#~ msgid "Empty member in relation." +#~ msgstr "關係中的成員是空的。" + +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "參數「{0}」不能為空值(null)" + +#~ msgid "Apply partial resolutions" +#~ msgstr "套用部分解決方案" + +#~ msgid "Authors: {0}" +#~ msgstr "作者：{0}" + +#~ msgid "Occupied By" +#~ msgstr "被此佔據：" + +#~ msgid "Remove Selected" +#~ msgstr "移陳選取的" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "關係編輯器：{0}" + +#~ msgid "Cannot connect to server." +#~ msgstr "不能連線至伺服器。" + +#~ msgid "Error parsing server response." +#~ msgstr "解析伺服器回應時發生錯誤。" + +#~ msgid "Error when communicating with server." +#~ msgstr "與伺服器連線時發生錯誤。" + +#~ msgid "Please enter the desired coordinates first." +#~ msgstr "請先輸入想要的坐標。" + +#~ msgid "Select a bookmark first." +#~ msgstr "先選擇一個書籤。" + +#~ msgid "Please enter a search string" +#~ msgstr "請輸入搜尋字串" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "投影法「{0}」只設計用於\n" +#~ "緯度 46.1° 到 57° 之間。\n" +#~ "如果您不是使用法國 WMS 伺服器，\n" +#~ "請使用別種投影系統。\n" +#~ "看到此訊息後請勿上傳任何資料。" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "投影法「{0}」只設計用於\n" +#~ "緯度 45.7° 到 47.9° 和\n" +#~ "經度 5.7° 到 10.6° 之間。\n" +#~ "如果您不是在製作瑞士或列支敦斯登的資料，\n" +#~ "請使用別種投影系統。\n" +#~ "看到此訊息後請勿上傳任何資料。" + +#~ msgid "Error while parsing" +#~ msgstr "分析時發生錯誤" + +#~ msgid "Tagging preset source" +#~ msgstr "標籤預設組合來源" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm." +#~ "openstreetmap.de/wiki/TaggingPresets 的說明。" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "加入新的標籤預設組合來源到清單。" + +#~ msgid "Tagging preset sources" +#~ msgstr "標籤預設組合來源" + +#~ msgid "Unknown version" +#~ msgstr "不明的版本" + +#~ msgid "Invalid projection" +#~ msgstr "無效的投影" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "OSM 資料缺少版本編號" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。" + +#~ msgid "" +#~ "(You can change the number of days after which this warning appears
by " +#~ "setting the config option 'pluginmanager.warntime'.)" +#~ msgstr "" +#~ "(您可以設定這個警告每隔幾天出現，
只要設定選項「pluginmanager." +#~ "warntime」。)" + +#~ msgid "Found element in non-way." +#~ msgstr "在非-路徑中發現 元件。" + +#~ msgid "Found element in non-relation." +#~ msgstr "在非-關係中發現 元件。" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開" + +#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" +#~ msgstr "手動設定藍勃特區（例如用於兩個區域間的位置）" + +#~ msgid "Open a layer first (GPX, OSM, cache)" +#~ msgstr "先開啓圖層　(GPX, OSM, 快取)" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "將 TCX 檔案匯入為 GPS 軌跡" + +#~ msgid "Replaces Selection with Users data" +#~ msgstr "以使用者資料取代選擇區域" + +#~ msgid "Please choose a user using the author panel" +#~ msgstr "請使用作者面板選擇一個使用者" + +#~ msgid "Sorry, doesn't work with anonymous users" +#~ msgstr "抱歉，不能用於匿名使用者" + +#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." +#~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。" + +#~ msgid "Validate" +#~ msgstr "檢驗" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "檢驗目前的選擇區域或整個資料組合。" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "使用群組「{1}」的預設組合「{0}」" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "使用預設組合「{0}」" + +#~ msgid "Change the projection to {0} first." +#~ msgstr "先將投影改變為 {0}。" + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "初始化 API 失敗。請稍後再試一次。" + +#~ msgid "error loading metadata" +#~ msgstr "載入中繼資料時發生錯誤" + +#~ msgid "requested: {0}" +#~ msgstr "要求的：{0}" + +#~ msgid "error requesting update" +#~ msgstr "要求更新時發生錯誤" + +#~ msgid "Import TCX File..." +#~ msgstr "匯入 TCX 檔案..." + +#~ msgid "Show Author Panel" +#~ msgstr "顯示作者面板" + +#~ msgid "Continue anyway" +#~ msgstr "強制繼續" + +#~ msgid "Please select some data" +#~ msgstr "請選取一些資料" + +#~ msgid "Open User Page in browser" +#~ msgstr "在瀏覽器中開啟使用者頁面" + +#~ msgid "Select User's Data" +#~ msgstr "選擇使用者的資料" + +#~ msgid "Open User Page" +#~ msgstr "開啟使用者頁面" + +#~ msgid "Reached a junction" +#~ msgstr "到達交會點" + +#~ msgid "Reached the end of the line" +#~ msgstr "到達線條的結尾" #~ msgid "Select a starting node on the end of a way" #~ msgstr "在路徑的結尾選擇開始的節點" - -#~ msgid "Reached the end of the line" -#~ msgstr "到達線條的結尾" - -#~ msgid "Reached a junction" -#~ msgstr "到達交會點" - -#~ msgid "help" -#~ msgstr "求助" - -#~ msgid "Help / About" -#~ msgstr "求助 / 關於" #~ msgid "" @@ -26995,380 +27516,4 @@ #~ "注意：請確定圖片是合適的，沒有版權問題，如果有疑慮，請不要使用。" -#~ msgid "WMS Plugin Help" -#~ msgstr "WMS 外掛程式求助" - -#~ msgid "File could not be found." -#~ msgstr "找不到檔案" - -#~ msgid "Combine Anyway" -#~ msgstr "合併，不管怎樣" - -#~ msgid "Open in Browser" -#~ msgstr "在瀏覽器中打開" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSM 線上說明" - -#~ msgid "unnamed" -#~ msgstr "未命名的" - -#~ msgid "Unsaved Changes" -#~ msgstr "未儲存的變更" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "提示：部分變更來自上傳到伺服器的新資料。" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "節點中有部分(幾乎)在直線裡" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "是否組合有不同關係成員的路徑？" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？" - -#~ msgid "All the ways were empty" -#~ msgstr "所有的路徑都是空的" - -#~ msgid "Please select at least one task to download" -#~ msgstr "請選擇至少一項要下載的工作" - -#~ msgid "Can only edit help pages from JOSM Online Help" -#~ msgstr "只能在 JOSM 線上求助中編輯求助頁面" - -#~ msgid "Error while loading page {0}" -#~ msgstr "載入頁面 {0} 時發生錯誤" - -#~ msgid "History of Element" -#~ msgstr "元件歷史" - -#~ msgid "Merge Anyway" -#~ msgstr "強制合併" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "是否合併有不同成員的節點？" - -#~ msgid "Only two nodes allowed" -#~ msgstr "只允許兩個節點" - -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "請選擇一或多個至少有四個節點的封閉路徑。" - -#~ msgid "Only one node selected" -#~ msgstr "只選取一個節點" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "請選擇有近乎正確角度的路徑來做直角化。" - -#~ msgid "No document open so nothing to save." -#~ msgstr "尚未開啟文件故沒有可儲存的項目。" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。" - -#~ msgid "Unknown file extension." -#~ msgstr "不明的延伸檔名。" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？" - -#~ msgid "Update Data" -#~ msgstr "更新資料" - -#~ msgid "Update failed" -#~ msgstr "更新失敗" - -#~ msgid "Upload to OSM..." -#~ msgstr "上傳至 OSM..." - -#~ msgid "Conflict detected" -#~ msgstr "偵測到衝突" - -#~ msgid "Upload to OSM API failed" -#~ msgstr "上傳至 OSM API 失敗" - -#~ msgid "No data imported." -#~ msgstr "沒有匯入資料。" - -#~ msgid "Data Layer" -#~ msgstr "資料圖層" - -#~ msgid "Delete {1} {0}" -#~ msgstr "刪除 {1} {0}" - -#~ msgid "Conflicting relation" -#~ msgstr "衝突的關係" - -#~ msgid "Move" -#~ msgstr "移動" - -#~ msgid "nodes" -#~ msgstr "節點" - -#~ msgid "ways" -#~ msgstr "路徑" - -#~ msgid "relations" -#~ msgstr "關係" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "File not found" -#~ msgstr "找不到檔案" - -#~ msgid "Merging conflicts." -#~ msgstr "正在合併衝突。" - -#~ msgid "Conflicts: {0}" -#~ msgstr "衝突： {0}" - -#~ msgid "Layers: {0}" -#~ msgstr "圖層：{0}" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "標籤 (數值留空會刪除該標籤)" - -#~ msgid "Move Up" -#~ msgstr "上移" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "將所有目前選取的物件加入為成員" - -#~ msgid "Move Down" -#~ msgstr "下移" - -#~ msgid "There were conflicts during import." -#~ msgstr "匯入時有衝突項目。" - -#~ msgid "Cannot read place search results from server" -#~ msgstr "不能從伺服器讀取位置搜尋結果" - -#~ msgid "name" -#~ msgstr "名稱" - -#~ msgid "zoom" -#~ msgstr "縮放" - -#~ msgid "Public" -#~ msgstr "公開" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "不能開啓偏好設定目錄：{0}" - -#~ msgid "Empty member in relation." -#~ msgstr "關係中的成員是空的。" - -#~ msgid "parameter '{0}' must not be null" -#~ msgstr "參數「{0}」不能為空值(null)" - -#~ msgid "Apply partial resolutions" -#~ msgstr "套用部分解決方案" - -#~ msgid "Authors: {0}" -#~ msgstr "作者：{0}" - -#~ msgid "Occupied By" -#~ msgstr "被此佔據：" - -#~ msgid "Remove Selected" -#~ msgstr "移陳選取的" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "關係編輯器：{0}" - -#~ msgid "Cannot connect to server." -#~ msgstr "不能連線至伺服器。" - -#~ msgid "Error parsing server response." -#~ msgstr "解析伺服器回應時發生錯誤。" - -#~ msgid "Error when communicating with server." -#~ msgstr "與伺服器連線時發生錯誤。" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "請先輸入想要的坐標。" - -#~ msgid "Select a bookmark first." -#~ msgstr "先選擇一個書籤。" - -#~ msgid "Please enter a search string" -#~ msgstr "請輸入搜尋字串" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "投影法「{0}」只設計用於\n" -#~ "緯度 46.1° 到 57° 之間。\n" -#~ "如果您不是使用法國 WMS 伺服器，\n" -#~ "請使用別種投影系統。\n" -#~ "看到此訊息後請勿上傳任何資料。" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 45.7° and 47.9°\n" -#~ "and longitutes between 5.7° and 10.6° only.\n" -#~ "Use another projection system if you are not working\n" -#~ "on a data set of Switzerland or Liechtenstein.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "投影法「{0}」只設計用於\n" -#~ "緯度 45.7° 到 47.9° 和\n" -#~ "經度 5.7° 到 10.6° 之間。\n" -#~ "如果您不是在製作瑞士或列支敦斯登的資料，\n" -#~ "請使用別種投影系統。\n" -#~ "看到此訊息後請勿上傳任何資料。" - -#~ msgid "Error while parsing" -#~ msgstr "分析時發生錯誤" - -#~ msgid "Tagging preset source" -#~ msgstr "標籤預設組合來源" - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm." -#~ "openstreetmap.de/wiki/TaggingPresets 的說明。" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "加入新的標籤預設組合來源到清單。" - -#~ msgid "Tagging preset sources" -#~ msgstr "標籤預設組合來源" - -#~ msgid "Unknown version" -#~ msgstr "不明的版本" - -#~ msgid "Invalid projection" -#~ msgstr "無效的投影" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Version number missing from OSM data" -#~ msgstr "OSM 資料缺少版本編號" - -#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。" - -#~ msgid "" -#~ "(You can change the number of days after which this warning appears
by " -#~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "" -#~ "(您可以設定這個警告每隔幾天出現，
只要設定選項「pluginmanager." -#~ "warntime」。)" - -#~ msgid "Found element in non-way." -#~ msgstr "在非-路徑中發現 元件。" - -#~ msgid "Found element in non-relation." -#~ msgstr "在非-關係中發現 元件。" - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開" - -#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -#~ msgstr "手動設定藍勃特區（例如用於兩個區域間的位置）" - -#~ msgid "Open a layer first (GPX, OSM, cache)" -#~ msgstr "先開啓圖層　(GPX, OSM, 快取)" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "將 TCX 檔案匯入為 GPS 軌跡" - -#~ msgid "Replaces Selection with Users data" -#~ msgstr "以使用者資料取代選擇區域" - -#~ msgid "Please choose a user using the author panel" -#~ msgstr "請使用作者面板選擇一個使用者" - -#~ msgid "Sorry, doesn't work with anonymous users" -#~ msgstr "抱歉，不能用於匿名使用者" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。" - -#~ msgid "Validate" -#~ msgstr "檢驗" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "檢驗目前的選擇區域或整個資料組合。" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "使用群組「{1}」的預設組合「{0}」" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "使用預設組合「{0}」" - -#~ msgid "Change the projection to {0} first." -#~ msgstr "先將投影改變為 {0}。" - -#~ msgid "Failed to initialize API. Please try again later." -#~ msgstr "初始化 API 失敗。請稍後再試一次。" - -#~ msgid "error loading metadata" -#~ msgstr "載入中繼資料時發生錯誤" - -#~ msgid "requested: {0}" -#~ msgstr "要求的：{0}" - -#~ msgid "error requesting update" -#~ msgstr "要求更新時發生錯誤" - -#~ msgid "Import TCX File..." -#~ msgstr "匯入 TCX 檔案..." - -#~ msgid "Show Author Panel" -#~ msgstr "顯示作者面板" - -#~ msgid "Continue anyway" -#~ msgstr "強制繼續" - -#~ msgid "Please select some data" -#~ msgstr "請選取一些資料" - -#~ msgid "Open User Page in browser" -#~ msgstr "在瀏覽器中開啟使用者頁面" - -#~ msgid "Select User's Data" -#~ msgstr "選擇使用者的資料" - -#~ msgid "Open User Page" -#~ msgstr "開啟使用者頁面" - #~ msgid "Please select the row to copy." #~ msgstr "請選擇要複製的列。" @@ -27396,4 +27541,13 @@ #~ msgstr "要求更新" +#~ msgid "help" +#~ msgstr "求助" + +#~ msgid "Help / About" +#~ msgstr "求助 / 關於" + +#~ msgid "WMS Plugin Help" +#~ msgstr "WMS 外掛程式求助" + #~ msgid "Station" #~ msgstr "車站" @@ -27441,2 +27595,11 @@ #~ msgid "Unexpected return value. Got {0}." #~ msgstr "未預期的回傳值。得到 {0}" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "找不到最早的版本。歷史紀錄是空的。" + +#~ msgid "No latest version found. History is empty." +#~ msgstr "找不到最新的版本。歷史紀錄是空的。" Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java (revision 18772) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java (revision 18773) @@ -15,8 +15,8 @@ public static CacheFileLambert4ZoneFilter[] filters = { - new CacheFileLambert4ZoneFilter("1", tr("Lambert Zone 1 cache file (.1)")), - new CacheFileLambert4ZoneFilter("2", tr("Lambert Zone 2 cache file (.2)")), - new CacheFileLambert4ZoneFilter("3", tr("Lambert Zone 3 cache file (.3)")), - new CacheFileLambert4ZoneFilter("4", tr("Lambert Zone 4 cache file (.4)")) + new CacheFileLambert4ZoneFilter("1", tr("Lambert Zone {0} cache file (.{0})", 1)), + new CacheFileLambert4ZoneFilter("2", tr("Lambert Zone {0} cache file (.{0})", 2)), + new CacheFileLambert4ZoneFilter("3", tr("Lambert Zone {0} cache file (.{0})", 3)), + new CacheFileLambert4ZoneFilter("4", tr("Lambert Zone {0} cache file (.{0})", 4)) }; Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java (revision 18772) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java (revision 18773) @@ -17,13 +17,13 @@ public static CacheFileLambert9ZoneFilter[] filters = { - new CacheFileLambert9ZoneFilter("cc1", tr("Lambert CC9 Zone 1 cache file (.CC1)")), - new CacheFileLambert9ZoneFilter("cc2", tr("Lambert CC9 Zone 2 cache file (.CC2)")), - new CacheFileLambert9ZoneFilter("cc3", tr("Lambert CC9 Zone 3 cache file (.CC3)")), - new CacheFileLambert9ZoneFilter("cc4", tr("Lambert CC9 Zone 4 cache file (.CC4)")), - new CacheFileLambert9ZoneFilter("cc5", tr("Lambert CC9 Zone 5 cache file (.CC5)")), - new CacheFileLambert9ZoneFilter("cc6", tr("Lambert CC9 Zone 6 cache file (.CC6)")), - new CacheFileLambert9ZoneFilter("cc7", tr("Lambert CC9 Zone 7 cache file (.CC7)")), - new CacheFileLambert9ZoneFilter("cc8", tr("Lambert CC9 Zone 8 cache file (.CC8)")), - new CacheFileLambert9ZoneFilter("cc9", tr("Lambert CC9 Zone 9 cache file (.CC9)")) + new CacheFileLambert9ZoneFilter("cc1", tr("Lambert CC9 Zone {0} cache file (.CC{0})",1)), + new CacheFileLambert9ZoneFilter("cc2", tr("Lambert CC9 Zone {0} cache file (.CC{0})",2)), + new CacheFileLambert9ZoneFilter("cc3", tr("Lambert CC9 Zone {0} cache file (.CC{0})",3)), + new CacheFileLambert9ZoneFilter("cc4", tr("Lambert CC9 Zone {0} cache file (.CC{0})",4)), + new CacheFileLambert9ZoneFilter("cc5", tr("Lambert CC9 Zone {0} cache file (.CC{0})",5)), + new CacheFileLambert9ZoneFilter("cc6", tr("Lambert CC9 Zone {0} cache file (.CC{0})",6)), + new CacheFileLambert9ZoneFilter("cc7", tr("Lambert CC9 Zone {0} cache file (.CC{0})",7)), + new CacheFileLambert9ZoneFilter("cc8", tr("Lambert CC9 Zone {0} cache file (.CC{0})",8)), + new CacheFileLambert9ZoneFilter("cc9", tr("Lambert CC9 Zone {0} cache file (.CC{0})",9)) };