Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 19698) +++ applications/editors/josm/i18n/po/gl.po (revision 19934) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-31 16:51+0100\n" +"POT-Creation-Date: 2010-02-08 15:25+0100\n" "PO-Revision-Date: 2010-01-23 22:22+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: 2010-01-31 15:38+0000\n" +"X-Launchpad-Export-Date: 2010-02-07 18:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -24,7 +24,7 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:314 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" @@ -71,5 +71,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:742 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237 @@ -79,10 +79,10 @@ #: ../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:199 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:237 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:160 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:497 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:529 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 @@ -174,4 +174,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:167 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52 msgid "Plugins" @@ -204,5 +205,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123 msgid "Continue" @@ -219,4 +220,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 @@ -233,7 +235,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 @@ -246,14 +248,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 @@ -262,6 +264,6 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105 -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272 @@ -391,5 +393,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258 @@ -431,9 +433,12 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32 @@ -444,4 +449,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:63 +#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45 #, java-format @@ -469,6 +475,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 @@ -572,5 +578,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43 @@ -679,9 +686,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:902 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:231 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 @@ -732,41 +739,81 @@ msgstr "Descargar datos do mapa do servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36 +#, fuzzy +msgid "Download object..." +msgstr "Descargando..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36 +#, fuzzy +msgid "Download OSM object by ID." +msgstr "Descargando datos de OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37 +#, fuzzy +msgid "Download Object..." +msgstr "Descargando..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 +msgid "Separate Layer" +msgstr "Capa Distinta" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70 +msgid "Select if the data should be downloaded into a new layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45 +#, fuzzy +msgid "Download referrers" +msgstr "Descargar Membros" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46 +msgid "Select if the referrers of the object should be downloaded as well" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54 +#, fuzzy +msgid "Object type:" +msgstr "Obxectos para engadir:" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:61 +#, fuzzy +msgid "Object ID:" +msgstr "Obxecto" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 +#, fuzzy +msgid "Enter the ID of the object that should be downloaded" +msgstr "O nome do obxecto na posición do punteiro do rato." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:74 +#, fuzzy +msgid "Download Object" +msgstr "Área de Descarga" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43 +#, fuzzy +msgid "Download object" +msgstr "Descargar Lugar" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:80 +#, fuzzy +msgid "Start downloading" +msgstr "Descargando..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95 +msgid "Close dialog and cancel downloading" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30 msgid "Download parent ways/relations..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:226 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 -#, java-format -msgid "There was {0} conflict during import." -msgid_plural "There were {0} conflicts during import." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231 -msgid "Conflict during download" -msgid_plural "Conflicts during download" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256 -#, java-format -msgid "({0}/{1}) Loading parents of node {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257 -#, java-format -msgid "({0}/{1}) Loading parents of way {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258 -#, java-format -msgid "({0}/{1}) Loading parents of relation {2}" msgstr "" @@ -784,12 +831,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20 -#, fuzzy msgid "Duplicate Layer" -msgstr "Duplicar" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20 -#, fuzzy msgid "Make a duplicate of the currently selected layer." -msgstr "Mover os membros actualmente seleccionados cara arriba" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 @@ -801,7 +846,7 @@ #. Translators: "Copy of {layer name}" #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42 -#, fuzzy, java-format +#, java-format msgid "Copy of {0}" -msgstr "Facer zoom a {0}" +msgstr "" #. Translators: "Copy {number} of {layer name}" @@ -1199,12 +1244,4 @@ msgstr "Abrir unha URL." -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -msgid "Separate Layer" -msgstr "Capa Distinta" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70 -msgid "Select if the data should be downloaded into a new layer" -msgstr "" - #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77 msgid "Enter URL to download:" @@ -1225,8 +1262,4 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94 msgid "Start downloading data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95 -msgid "Close dialog and cancel downloading" msgstr "" @@ -1251,7 +1284,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 -#, fuzzy msgid "Move nodes so all angles are 90 or 270 degrees" -msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 @@ -1310,7 +1342,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415 -#, fuzzy msgid "Please select ways with angles of approximately 90 or 180 degrees." -msgstr "Por favor, selecciona vías con ángulos case rectos para ortogonalizar." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 @@ -1419,9 +1450,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348 @@ -1430,6 +1461,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 @@ -1438,5 +1469,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679 @@ -1454,5 +1485,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82 @@ -1487,4 +1518,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239 +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153 msgid "Save" msgstr "Gardar" @@ -1595,5 +1629,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:122 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 @@ -2120,4 +2154,34 @@ msgstr "Erros durante a descarga" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:177 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#, java-format +msgid "There was {0} conflict during import." +msgid_plural "There were {0} conflicts during import." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:182 +msgid "Conflict during download" +msgid_plural "Conflicts during download" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:221 +#, java-format +msgid "({0}/{1}) Loading parents of node {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222 +#, java-format +msgid "({0}/{1}) Loading parents of way {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:223 +#, java-format +msgid "({0}/{1}) Loading parents of relation {2}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" @@ -2260,5 +2324,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -3254,15 +3318,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Version.java:46 +#: ../core/src/org/openstreetmap/josm/data/Version.java:47 #, java-format msgid "Failed to load resource ''{0}'', error is {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Version.java:93 -#: ../core/src/org/openstreetmap/josm/data/Version.java:156 +#: ../core/src/org/openstreetmap/josm/data/Version.java:98 +#: ../core/src/org/openstreetmap/josm/data/Version.java:161 msgid "UNKNOWN" msgstr "DESCOÑECIDO" -#: ../core/src/org/openstreetmap/josm/data/Version.java:107 +#: ../core/src/org/openstreetmap/josm/data/Version.java:112 #, java-format msgid "" @@ -3270,5 +3334,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Version.java:140 +#: ../core/src/org/openstreetmap/josm/data/Version.java:145 msgid "Warning: the revision file ''/REVISION'' is missing." msgstr "" @@ -3359,6 +3423,7 @@ #. should not happen -#. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278 +#. FIXME: this message does not make sense, source version can not be lower than +#. target version at this point +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:279 #, java-format msgid "" @@ -3430,19 +3495,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:364 msgid "A primitive with ID = 0 cannot be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:421 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:423 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:634 #, java-format msgid "" @@ -3451,5 +3516,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1006 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3457,5 +3522,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1008 #, java-format msgid "" @@ -3463,121 +3528,8 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572 -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593 -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610 -#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628 -msgid "" -"Tag collection cannot be applied to a primitive because there are keys with " -"multiple values." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314 -#, java-format -msgid "Cannot add node {0} to incomplete way {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112 -#, java-format -msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 -#, java-format -msgid "Parameter {0} not in range 0..{1}. Got ''{2}''." -msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188 -msgid "Area style way is not closed." -msgstr "A vía de estilo de área non está pechada." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266 -msgid "More than one \"from\" way found." -msgstr "Atopadas máis de unha vía \"desde\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272 -msgid "More than one \"to\" way found." -msgstr "Atopadas máis de unha vía \"ata\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292 -msgid "More than one \"via\" found." -msgstr "Atopouse máis de un \"vía\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:297 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "Papel \"{0}\" descoñecido." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:300 -#, java-format -msgid "Unknown member type for ''{0}''." -msgstr "Tipo de membro descoñecido para \"{0}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:306 -msgid "No \"from\" way found." -msgstr "Non se atoparon vias \"desde\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:310 -msgid "No \"to\" way found." -msgstr "Non se atoparon vías \"ata\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:314 -msgid "No \"via\" node or way found." -msgstr "Ningún nodo o vía \"vía\" atopados." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323 -msgid "The \"from\" way does not start or end at a \"via\" node." -msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327 -msgid "The \"to\" way does not start or end at a \"via\" node." -msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355 -msgid "The \"from\" way does not start or end at the \"via\" way." -msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359 -msgid "The \"to\" way does not start or end at the \"via\" way." -msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453 -#, java-format -msgid "Style for restriction {0} not found." -msgstr "Non se atopou o estilo para a restrición {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:525 -#, java-format -msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:553 -#, java-format -msgid "Style for outer way ''{0}'' mismatches." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751 -#, java-format -msgid "Error: {0}" -msgstr "Erro: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751 -#, java-format -msgid "Warning: {0}" -msgstr "Advertencia: {0}" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 -msgid "inactive" -msgstr "Inactivo" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 -msgid "selected" -msgstr "seleccionado" - +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3586,6 +3538,7 @@ msgstr[1] "nodos" +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3595,8 +3548,9 @@ #. dark blue +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3605,4 +3559,118 @@ msgstr[1] "relacións" +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628 +msgid "" +"Tag collection cannot be applied to a primitive because there are keys with " +"multiple values." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#, java-format +msgid "Cannot add node {0} to incomplete way {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112 +#, java-format +msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 +#, java-format +msgid "Parameter {0} not in range 0..{1}. Got ''{2}''." +msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188 +msgid "Area style way is not closed." +msgstr "A vía de estilo de área non está pechada." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266 +msgid "More than one \"from\" way found." +msgstr "Atopadas máis de unha vía \"desde\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272 +msgid "More than one \"to\" way found." +msgstr "Atopadas máis de unha vía \"ata\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292 +msgid "More than one \"via\" found." +msgstr "Atopouse máis de un \"vía\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:297 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "Papel \"{0}\" descoñecido." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:300 +#, java-format +msgid "Unknown member type for ''{0}''." +msgstr "Tipo de membro descoñecido para \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:306 +msgid "No \"from\" way found." +msgstr "Non se atoparon vias \"desde\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:310 +msgid "No \"to\" way found." +msgstr "Non se atoparon vías \"ata\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:314 +msgid "No \"via\" node or way found." +msgstr "Ningún nodo o vía \"vía\" atopados." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323 +msgid "The \"from\" way does not start or end at a \"via\" node." +msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327 +msgid "The \"to\" way does not start or end at a \"via\" node." +msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355 +msgid "The \"from\" way does not start or end at the \"via\" way." +msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359 +msgid "The \"to\" way does not start or end at the \"via\" way." +msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453 +#, java-format +msgid "Style for restriction {0} not found." +msgstr "Non se atopou o estilo para a restrición {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:525 +#, java-format +msgid "Style for inner way ''{0}'' equals multipolygon." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:553 +#, java-format +msgid "Style for outer way ''{0}'' mismatches." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751 +#, java-format +msgid "Error: {0}" +msgstr "Erro: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751 +#, java-format +msgid "Warning: {0}" +msgstr "Advertencia: {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13 +msgid "inactive" +msgstr "Inactivo" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14 +msgid "selected" +msgstr "seleccionado" + #. teal #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 @@ -3617,5 +3685,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "background" @@ -3755,5 +3823,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:198 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again (remembers choice)" @@ -3798,5 +3866,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 @@ -3856,4 +3924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172 msgid "Conflict" msgstr "Conflito" @@ -3881,5 +3950,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4097,15 +4166,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 msgid "File" msgstr "Ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947 #: ../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:193 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:208 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 @@ -4116,19 +4185,19 @@ msgstr "Edición" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 msgid "Tools" msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226 msgid "Presets" msgstr "Axustes prestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:193 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:195 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:59 @@ -4139,5 +4208,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:301 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304 msgid "Audio" msgstr "Audio" @@ -4302,5 +4371,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:491 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4342,12 +4411,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4357,6 +4426,6 @@ msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:243 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4364,6 +4433,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:238 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4371,9 +4440,9 @@ msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:166 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflict)" @@ -4382,5 +4451,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4389,26 +4458,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 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:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:182 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4416,68 +4485,78 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:203 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 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:292 msgid "Conflict Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:334 +#, fuzzy, java-format +msgid "{0} more..." +msgstr "{0} nodo" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:336 +#, java-format +msgid "Following primitives could not be added because they are deleted: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 #, 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:737 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:777 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:791 #, java-format msgid "Item {0} not found in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237 msgid "lock scrolling" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245 msgid "Compare " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 msgid "My version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139 msgid "Merged version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4485,30 +4564,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 msgid "Their version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425 msgid "> top" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427 msgid "Copy my selected nodes to the start of the merged node list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452 msgid "> bottom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4516,5 +4595,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4522,14 +4601,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4537,5 +4616,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4543,23 +4622,31 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643 +msgid "Use all mine elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669 +msgid "Use all their elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 msgid "Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 msgid "Move up the selected elements by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 msgid "Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:730 msgid "Move down the selected entries by one position." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 @@ -4570,27 +4657,27 @@ msgstr "Eliminar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:762 msgid "Remove the selected entries from the list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:791 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828 msgid "Freeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829 msgid "Freeze the current list of merged elements." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824 msgid "Unfreeze" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825 msgid "Unfreeze the list of merged elements and start merging." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:779 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850 #, java-format msgid "" @@ -4599,5 +4686,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:784 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855 #, java-format msgid "" @@ -4606,5 +4693,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:802 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873 #, java-format msgid "My version ({0} entry)" @@ -4613,5 +4700,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:805 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:876 #, java-format msgid "Merged version ({0} entry)" @@ -4620,5 +4707,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:808 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:879 #, java-format msgid "Their version ({0} entry)" @@ -4627,5 +4714,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:871 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:942 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format @@ -4635,5 +4722,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:886 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format @@ -4645,14 +4732,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93 -#, java-format -msgid "Node {0} cannot be added to the way because it was deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 #, java-format msgid "" @@ -4661,19 +4743,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 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:466 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:500 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 msgid "No, cancel operation" msgstr "Non, cancelar a operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 #, java-format msgid "" @@ -4686,9 +4768,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 msgid "Undelete additional nodes?" msgstr "Desfacer o borrado de nodos adicionais?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 #, java-format msgid "" @@ -4701,13 +4783,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 msgid "Undelete dependent primitives?" msgstr "Desfacer o borrado de primitivas dependentes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4715,92 +4797,98 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#, fuzzy +msgid "Referenced by:" +msgstr "Preferencias" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 #: ../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:352 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 #: ../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:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 #, java-format msgid "" @@ -4810,17 +4898,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 #, java-format msgid "" @@ -4829,9 +4917,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 msgid "Undecide conflict between visible state" msgstr "" @@ -4842,10 +4930,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103 -#, java-format -msgid "Primitive {0} cannot be added to the relation because it was deleted." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121 msgid "Merged nodes not frozen yet. Cannot build resolution command" msgstr "" @@ -4879,6 +4962,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4892,6 +4975,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4908,25 +4991,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 msgid "Their version (server dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 msgid "Mark the selected tags as undecided" msgstr "" @@ -5058,5 +5141,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 @@ -5068,5 +5151,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format @@ -5254,5 +5337,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -5274,9 +5357,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#, fuzzy, java-format +msgid "Conflicts: {0} unresolved" +msgstr "Conflitos: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5284,5 +5372,5 @@ "superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5291,44 +5379,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply resolved conflicts and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Close anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 #, java-format msgid "" "You did not finish to merge the differences in this conflict." "
Conflict resolutions will not be applied unless all differences
are " -"resolved.
Click {0} to close anyway." -"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +"resolved.
Click {0} to close anyway. " +"Already
resolved differences will not be applied.
Click " +"{1} to return to resolving conflicts." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5340,7 +5427,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:195 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 @@ -5353,4 +5440,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153 msgid "Add filter." msgstr "" @@ -5401,11 +5491,11 @@ msgstr "Amosar o historial de todos os elementos seleccionados." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 msgid "Object with history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 #: ../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/history/HistoryBrowserDialog.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100 @@ -5413,14 +5503,14 @@ msgstr "Recargar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:273 msgid "Reload all currently selected objects and refresh the list." msgstr "" "Recargar todos os obxectos seleccionados actualmente e actualizar a lista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:313 msgid "Display the history of the selected objects." msgstr "" @@ -5461,7 +5551,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504 -#, fuzzy msgid "Duplicate this layer" -msgstr "Duplicar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603 @@ -5549,10 +5638,10 @@ msgstr "Facer zoom sobre a selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:297 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 @@ -5560,5 +5649,5 @@ msgstr "Selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:351 #, java-format msgid "Selection: {0}" @@ -5652,5 +5741,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:125 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123 msgid "Close the dialog" msgstr "" @@ -6803,5 +6892,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47 -msgid "Enter a changset id" +msgid "Enter a changeset id" msgstr "" @@ -6819,4 +6908,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996 +#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48 msgid "Please enter an integer value > 0" msgstr "" @@ -6996,5 +7086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109 msgid "" -"Select to restrict the query to your changsets only.
Unselect to " +"Select to restrict the query to your changesets only.
Unselect to " "include all changesets in the query." msgstr "" @@ -7089,5 +7179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183 #, java-format msgid "This will change {0} object." @@ -7096,22 +7186,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:185 msgid "An empty value deletes the tag." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:114 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:377 msgid "Change values?" msgstr "Cambiar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:310 #, java-format msgid "Change properties of up to {0} object" @@ -7120,5 +7211,5 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:350 #, java-format msgid "This will change up to {0} object." @@ -7127,86 +7218,86 @@ msgstr[1] "Esto cambiará ata {0} obxectos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352 msgid "Please select a key" msgstr "Por favor, selecciona unha tecla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:365 msgid "Please select a value" msgstr "Por favor selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:451 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor selecciona os obxectos dos que queres cambiar as propiedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457 msgid "Properties for selected objects." msgstr "Propiedades dos obxectos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:491 msgid "Member Of" msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:566 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:580 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:823 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:826 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:879 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880 msgid "Delete from relation" msgstr "Borrar da relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882 #, 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/properties/PropertiesDialog.java:889 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:903 msgid "Delete the selected key in all objects" msgstr "Borrar a clave seleccionada en todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:905 msgid "Delete Properties" msgstr "Borrar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 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/properties/PropertiesDialog.java:934 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:948 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/properties/PropertiesDialog.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:984 msgid "Select relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:985 msgid "Select relation in main selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987 msgid "Select in relation list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988 msgid "Select relation in relation list." msgstr "" @@ -7461,6 +7552,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 -msgid "" -"Click to to return to the relation editor and to resume relation editing" +msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -7900,4 +7990,7 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:56 +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:58 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56 @@ -7970,7 +8063,7 @@ "is not available yet. It is missing both in your local language ({1}) and in " "english.

Please help to improve the JOSM help system and fill in the " -"missing information.You can both edit the help topic in your " -"local language ({1}) and the help topic in english." +"missing information. You can both edit the help topic in " +"your local language ({1}) and the help topic in english.

" msgstr "" @@ -7988,5 +8081,5 @@ msgid "" "Failed to open help page for url {0}.
This is most likely due to a " -"network problem, please check your
your internet connection" +"network problem, please check
your internet connection" msgstr "" @@ -8072,5 +8165,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:141 msgid "Reload the history from the server" msgstr "" @@ -8446,5 +8539,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 -msgid "Please enter the password name of your OSM account" +msgid "Please enter the password of your OSM account" msgstr "" @@ -8508,5 +8601,5 @@ #, java-format msgid "" -"Warning: Failed to retrieve user infos for the current JOSM user. Exceptions " +"Warning: Failed to retrieve user infos for the current JOSM user. Exception " "was: {0}" msgstr "" @@ -8937,5 +9030,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:275 msgid "Continue uploading" msgstr "" @@ -8964,5 +9057,5 @@ #, java-format msgid "" -"The server reported that the current changset was closed.
This is most " +"The server reported that the current changeset was closed.
This is most " "likely because the changesets size exceeded the max. size
of {0} objects " "on the server ''{1}''." @@ -8980,5 +9073,5 @@ msgid "" "Click ''{0}'' to continue uploading to additional new " -"changsets.
Click ''{1}'' to return to the upload dialog." +"changesets.
Click ''{1}'' to return to the upload dialog." "
Click ''{2}'' to abort uploading and return to map " "editing.
" @@ -9013,5 +9106,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60 msgid "" "Mark modified objects from the current selection to " @@ -9019,5 +9112,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70 msgid "" "Mark locally deleted objects to be deleted on the " @@ -9025,9 +9118,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112 msgid "Select objects to upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261 msgid "Cancel uploading" msgstr "" @@ -9327,5 +9420,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:637 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225 @@ -9461,18 +9554,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736 msgid "Following problems found:" msgstr "" @@ -9522,24 +9615,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "Ficheiros GPX (*.gpx *.gpx.gz)" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 #, java-format msgid "Error while parsing {0}" msgstr "Erro durante a análise {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 #, java-format msgid "Could not read \"{0}\"" msgstr "Non se puido ler \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9548,34 +9641,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 msgid "Photo time (from exif):" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 msgid "Gps time (read from the above photo): " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291 msgid "I am in the timezone of: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 msgid "No date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364 msgid "Open another photo" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 msgid "" "Error while parsing the date.\n" @@ -9583,60 +9676,60 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 msgid "Invalid date" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 msgid "GPX track: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 msgid "Open another GPX trace" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507 msgid "" "Use photo of an accurate clock,
e.g. GPS receiver display" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512 msgid "Auto-Guess" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515 msgid "Manual adjust" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518 msgid "Override position for: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524 #, java-format msgid "Images with geo location in exif data ({0}/{1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 #, java-format msgid "Images that are already tagged ({0}/{1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533 msgid "Show Thumbnail images on the map" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558 msgid "Timezone: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569 msgid "Offset:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648 msgid "No gpx selected" msgstr "" @@ -9737,5 +9830,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1265 #, java-format msgid "" @@ -9744,5 +9837,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1335 #, java-format msgid "" @@ -9794,5 +9887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63 msgid "Geotagged Images" msgstr "Imaxes xeo-etiquetadas" @@ -9802,5 +9895,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:334 #, java-format msgid "{0} image loaded." @@ -9809,5 +9902,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:335 #, java-format msgid "{0} was found to be GPS tagged." @@ -9816,10 +9909,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:105 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:610 #, java-format msgid "" @@ -9828,5 +9921,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635 msgid "Image file could not be deleted." msgstr "" @@ -9847,55 +9940,55 @@ msgstr "Erro no ficheiro {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63 msgid "Display geotagged images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:83 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "Previo" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87 msgid "Show previous Image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:99 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120 #, java-format msgid "Geoimage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:94 msgid "Remove photo from layer" msgstr "Eliminar foto da capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109 msgid "Delete File from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:116 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "Seguinte" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120 msgid "Show next Image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:127 msgid "Center view" msgstr "Centrar vista" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:130 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:133 msgid "Move dialog to the side pane" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:243 #, java-format msgid "" @@ -9906,5 +9999,5 @@ "Altitude: {0} m" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:246 #, java-format msgid "" @@ -10153,5 +10246,5 @@ #, java-format msgid "" -"You have sucessfully retrieved an OAuth Access Token from the OSM " +"You have successfully retrieved an OAuth Access Token from the OSM " "website. Click on {0} to accept the token. JOSM will use it " "in subsequent requests to gain access to the OSM API." @@ -11144,5 +11237,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35 -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:42 msgid "Enable built-in defaults" msgstr "Activar os valores predeterminados incorporadas" @@ -11160,5 +11253,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:69 #, java-format msgid "The following plugin has been downloaded successfully:" @@ -11167,5 +11260,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82 #, java-format msgid "Downloading the following plugin has failed:" @@ -11175,65 +11268,69 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:117 msgid "Search:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:122 msgid "Enter a search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:168 +msgid "Plugin update policy" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200 msgid "Enter URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:213 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:236 msgid "Please select an entry." msgstr "Por favor selecciona unha entrada." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:206 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:207 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222 msgid "JOSM Plugin description URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:249 msgid "Configure Plugin Sites" msgstr "Configurar os sitios dos engadidos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:312 msgid "Download list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:313 msgid "Download the list of available plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:356 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:342 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:360 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:372 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:621 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:777 msgid "Update plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:343 msgid "Update the selected plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:395 msgid "Configure sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:396 msgid "Configure the list of sites where plugins are downloaded from" msgstr "" @@ -11599,9 +11696,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40 msgid "Sort presets menu" msgstr "Ordenar o menú de elementos preestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51 +#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52 msgid "Tagging Presets" msgstr "Axustes de etiquetado preestablecidos." @@ -11628,8 +11725,10 @@ msgstr "Personalizar os elementos da barra de ferramentas." +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:65 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:65 msgid "Plugin bundled with JOSM" msgstr "Engadido empaquetado con JOSM" +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:84 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:84 msgid "" @@ -11638,7 +11737,39 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112 #, java-format msgid "{0}: Version {1} (local: {2})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113 +msgid "Ask before updating" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118 +msgid "Always update withouth asking" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:123 +msgid "Never update" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84 +msgid "" +"Please decide whether JOSM shall automatically update active plugins at " +"startup after an update of JOSM itself." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96 +msgid "Update interval (in days):" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128 +msgid "" +"Please decide whether JOSM shall automatically update active plugins after a " +"certain periode of time." msgstr "" @@ -11907,5 +12038,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:337 #, java-format msgid "" @@ -11914,5 +12045,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:463 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" @@ -11920,18 +12051,18 @@ #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:486 msgid "Optional Attributes:" msgstr "Atributos Opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577 msgid "closedway" msgstr "vía pechada" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 #, java-format msgid "Unknown type: {0}" msgstr "Tipo descoñecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:665 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -11942,15 +12073,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #, java-format msgid "Error parsing {0}: " msgstr "Erro analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:704 #, 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:768 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767 #: ../plugins/terracer/src/terracer/TerracerAction.java:146 #, java-format @@ -11960,17 +12091,17 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:770 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:772 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:855 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -12006,4 +12137,9 @@ "URL from www.openstreetmap.org (you can paste a download URL here to specify " "a bounding box)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46 +msgid "" +"The current value is not a valid OSM ID. Please enter an integer value > 0" msgstr "" @@ -12552,5 +12688,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:196 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -12647,5 +12783,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:160 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:125 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -12653,5 +12789,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:167 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132 #, java-format msgid "Unsupported version: {0}" @@ -12718,12 +12854,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:112 -#, java-format -msgid "" -"Warning: ignoring changeset id {0} for new object with external id {1} and " -"internal id {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:156 #, java-format msgid "" @@ -12732,58 +12861,68 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:185 +msgid "Found XML element not as direct child of element ." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190 +#, java-format +msgid "Missing mandatory attribute ''{0}'' on of way {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196 +#, java-format +msgid "Illegal value of attribute ''ref'' of element . Got {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200 +#, fuzzy, java-format +msgid "Deleted way {0} contains nodes" +msgstr "A via seleccionada non contén o nodo seleccionado." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:220 +msgid "Found XML element not as direct child of element ." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226 +#, java-format +msgid "Missing attribute ''ref'' on member in relation {0}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231 +#, java-format +msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 +#, java-format +msgid "Missing attribute ''type'' on member {0} in relation {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#, java-format +msgid "" +"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 -msgid "Found XML element not as direct child of element ." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251 -#, java-format -msgid "Missing mandatory attribute ''{0}'' on of way {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257 -#, java-format -msgid "Illegal value of attribute ''ref'' of element . Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 -msgid "Found XML element not as direct child of element ." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:280 -#, java-format -msgid "Missing attribute ''ref'' on member in relation {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:285 -#, java-format -msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:289 -#, java-format -msgid "Missing attribute ''type'' on member {0} in relation {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:292 -#, java-format -msgid "" -"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:299 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta de elemento con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 +#, java-format +msgid "Deleted relation {0} contains members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290 msgid "Illegal object with ID=0." msgstr "Obxecto ilegal con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:365 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320 #, java-format msgid "" @@ -12793,8 +12932,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:371 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344 #, java-format msgid "" @@ -12804,10 +12943,10 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:384 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." @@ -12815,6 +12954,6 @@ #. for a new primitive we just log a warning -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:420 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:430 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382 #, java-format msgid "" @@ -12824,21 +12963,21 @@ #. for an existing primitive this is a problem -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:424 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:386 #, java-format msgid "Illegal value for attribute ''changeset''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395 #, java-format msgid "Missing required attribute ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:421 #, java-format msgid "" @@ -12846,18 +12985,17 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:433 +#, fuzzy, java-format +msgid "Deleted node {0} is part of way {1}" +msgstr "Borrar nodos ou vías." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441 +#, java-format +msgid "" +"Way {0} with {1} nodes has incomplete nodes because at least one node was " +"missing in the loaded data." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488 -#, java-format -msgid "" -"Marked way {0} with {1} nodes incomplete because at least one node was " -"missing in the loaded data and is therefore incomplete too." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534 -#, java-format -msgid "" -"Unknown relation member type ''{0}'' in relation with external id ''{1}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546 #, java-format msgid "" @@ -12866,13 +13004,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:512 +#, fuzzy, java-format +msgid "Deleted member {0} is used by relation {1}" +msgstr "Membro \"{0}\" borrado na relación." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:539 msgid "Prepare OSM data..." msgstr "Preparar os datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:594 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:540 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:545 msgid "Preparing data set..." msgstr "" @@ -13101,5 +13244,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215 +msgid "" +"Skipping plugin update after JOSM upgrade. Automatic update at startup is " +"disabled." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217 +msgid "" +"Skipping plugin update after elapsed update interval. Automatic update at " +"startup is disabled." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224 +msgid "" +"Running plugin update after JOSM upgrade. Automatic update at startup is " +"enabled." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226 +msgid "" +"Running plugin update after elapsed update interval. Automatic update at " +"startup is disabled." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232 +#, java-format +msgid "" +"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270 #, java-format msgid "" @@ -13111,5 +13284,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 #, java-format msgid "" @@ -13118,28 +13291,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381 #, java-format msgid "loading plugin ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:405 msgid "Loading plugins ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:406 msgid "Checking plugin preconditions..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:433 #, java-format msgid "Loading plugin ''{0}''..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:514 msgid "JOSM could not find information about the following plugin:" msgid_plural "JOSM could not find information about the following plugins:" @@ -13147,5 +13320,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522 msgid "The plugin is not going to be loaded." msgid_plural "The plugins are not going to be loaded." @@ -13153,17 +13326,17 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548 msgid "Determine plugins to load..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554 msgid "Removing deprecated plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:556 msgid "Removing umaintained plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:580 msgid "Updating the following plugin has failed:" msgid_plural "Updating the following plugins has failed:" @@ -13171,5 +13344,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:591 msgid "" "Please open the Preference Dialog after JOSM has started and try to update " @@ -13181,37 +13354,37 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:599 msgid "Plugin update failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:655 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:670 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:748 msgid "Disable plugin" msgstr "Desactivar engadido" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:657 #, java-format msgid "Click to delete the plugin ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:661 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:754 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:663 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:756 #, java-format msgid "Click to keep the plugin ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:732 #, java-format msgid "Warning: failed to delete outdated plugin ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:733 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739 #, java-format msgid "" @@ -13220,5 +13393,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:738 #, java-format msgid "" @@ -13227,10 +13400,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:750 #, java-format msgid "Click to disable the plugin ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:763 #, java-format msgid "" @@ -13239,10 +13412,10 @@ "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:766 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Dacordo coa información contida no engadido, o autor é {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:737 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:769 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -13251,9 +13424,9 @@ "dun fallo." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:771 msgid "Should the plugin be disabled?" msgstr "Debería ser desactivado o engadido?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:843 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -13261,15 +13434,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:853 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:885 msgid "Plugin information" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:858 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:179 msgid "no description available" msgstr "sen descripción dispoñible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890 -msgid "Do not check and ask again at startup (remembers choice)" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:922 +msgid "" +"Do not ask again and remember my decision (go to Preferences->Plugins to " +"change it later)" msgstr "" @@ -13589,5 +13764,5 @@ #, java-format msgid "" -"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"Warning: failed to access directory ''{0}'' for security reasons. Exception " "was: {1}" msgstr "" @@ -14061,13 +14236,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:155 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:157 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -14076,13 +14251,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:222 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:224 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:227 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:229 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:291 #, java-format msgid "" @@ -14090,34 +14265,39 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30 msgid "Replace original background by JOSM background color." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Reverse grey colors (for black backgrounds)." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 msgid "Set background transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36 msgid "Draw boundaries of downloaded data." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:187 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56 +msgid "" +"Automaticly select first WMS layer when grabing if multiple layers exist." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61 msgid "Enable automatic caching." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -14129,18 +14309,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:218 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -14148,5 +14328,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -14154,48 +14334,54 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:171 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:190 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:224 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Os ficheiros máis antigos son borrados automáticamente cando exceden este " "tamaño" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:230 +msgid "" +"Automatically selects the first WMS layer if multiple layers exist when " +"grabbing." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -14451,5 +14637,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:47 msgid "" "More than one WMS layer present\n" @@ -14463,28 +14649,28 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:212 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:214 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:214 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:216 msgid "Is not vectorized." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217 #, java-format msgid "Raster size: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:219 msgid "Is vectorized." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:218 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:220 #, java-format msgid "Commune bbox: {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:425 #, java-format msgid "" @@ -14495,14 +14681,14 @@ "Crear unha nova." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:426 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:446 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:450 msgid "Cache Lambert Zone Error" msgstr "" @@ -14860,4 +15046,34 @@ msgstr "Cargar conxunto de imaxes como unha nova capa" +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51 +msgid "Josminator - Just do it!" +msgstr "" + +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51 +msgid "Do some stuff" +msgstr "" + +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51 +msgid "Dsdfasdfsdfotos" +msgstr "" + +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129 +msgid "Exec" +msgstr "" + +#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121 +#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127 +#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129 +msgid "Execute Script" +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69 msgid "Direction index '{0}' not found" @@ -14892,4 +15108,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:146 +#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:75 msgid "Tracing" msgstr "" @@ -14919,4 +15136,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7 +#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerException.java:14 msgid "An unknown error has occurred" msgstr "" @@ -15531,72 +15749,96 @@ msgstr "" -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45 msgid "Read error!" msgstr "" -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47 msgid "Write error!" msgstr "" -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63 +msgid "Write position information into the exif header of the following files:" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79 #, fuzzy +msgid "settings" +msgstr "cadea" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82 +msgid "keep backup files" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85 +msgid "change file modification time:" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88 +msgid "to gps time" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88 +msgid "to previous value (unchanged mtime)" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140 +msgid "Photo Geotagging Plugin" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147 +msgid "Writing position information to image files..." +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171 +#, fuzzy +msgid "Could not read mtime." +msgstr "Non se puido ler \"{0}\"" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184 +#, fuzzy +msgid "Could not write mtime." +msgstr "Non se puido ler \"{0}\"" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224 +msgid "File could not be deleted!" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245 +msgid "Could not rename file!" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254 +msgid "

There are old backup files in the image directory!

" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258 +msgid "Override old backup files?" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 +msgid "Keep old backups and continue" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 +msgid "Override" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280 +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296 +msgid "Could not delete temporary file!" +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292 +msgid "Test failed: Could not read mtime." +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294 +msgid "Test failed: Could not write mtime." +msgstr "" + +#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37 msgid "Write coordinates to image header" -msgstr "Introducir as coordenadas para o novo nodo." - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84 -msgid "Write position information into the exif header of the following files:" -msgstr "" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99 -#, fuzzy -msgid "keep backup files" -msgstr "Conservar ficheiros de copia de seguridade" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104 -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134 -msgid "Photo Geotagging Plugin" -msgstr "" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140 -msgid "Writing position information to image files..." -msgstr "" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163 -#, fuzzy -msgid "Error: " -msgstr "Erro" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195 -#, fuzzy -msgid "File could not be deleted!" -msgstr "A hora introducida non puido ser analizada." - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202 -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216 -#, fuzzy -msgid "Could not rename file!" -msgstr "Renomear tamén o ficheiro" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225 -msgid "

There are old backup files in the image directory!

" -msgstr "" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229 -#, fuzzy -msgid "Override old backup files?" -msgstr "Conservar ficheiros de copia de seguridade" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230 -#, fuzzy -msgid "Keep old backups and continue" -msgstr "Conservar ficheiros de copia de seguridade" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230 -#, fuzzy -msgid "Override" -msgstr "Sobrescribir" - -#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251 -msgid "Could not delete temporary file!" msgstr "" @@ -16000,7 +16242,6 @@ #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140 -#, fuzzy msgid "Interpolation" -msgstr "Información" +msgstr "" #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142 @@ -16010,7 +16251,6 @@ #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144 -#, fuzzy msgid "Street" -msgstr "Seleccionar" +msgstr "" #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146 @@ -16031,17 +16271,14 @@ #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151 -#, fuzzy msgid "create an associatedStreet relation" -msgstr "Crear unha nova relación" +msgstr "" #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153 -#, fuzzy msgid "delete outline way" -msgstr "Borrar nodos ou vías." +msgstr "" #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169 -#, fuzzy msgid "Street name: " -msgstr "Ordenar o menú de elementos preestablecidos" +msgstr "" #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287 @@ -16114,4 +16351,21 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:258 msgid "Terrace" +msgstr "" + +#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82 +#, fuzzy +msgid "Merge objects nodes" +msgstr "Acoplar {0} nodos" + +#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 +msgid "Tracer" +msgstr "" + +#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 +msgid "Tracer." +msgstr "" + +#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136 +msgid "Tracer building" msgstr "" @@ -17406,11 +17660,17 @@ msgstr "" +#. Plugin JOSM_Script +#: build/trans_plugins.java:29 build/trans_plugins.java:31 +#, fuzzy +msgid "nice Plugin" +msgstr "Engadidos" + #. Plugin lakewalker -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:33 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:35 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -17418,5 +17678,5 @@ #. Plugin measurement -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:37 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -17426,10 +17686,10 @@ #. Plugin michigan_left -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:39 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:41 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -17438,5 +17698,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:43 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -17446,15 +17706,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:45 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:47 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:49 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -17462,5 +17722,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:51 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -17468,5 +17728,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:53 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -17475,5 +17735,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:55 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -17482,15 +17742,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:57 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:59 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:61 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -17499,10 +17759,10 @@ #. Plugin routing -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:63 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:65 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -17511,15 +17771,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:67 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:69 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:71 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -17529,10 +17789,17 @@ #. Plugin terracer -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Make terraced houses out of single blocks." msgstr "" +#. Plugin Tracer +#: build/trans_plugins.java:75 +msgid "" +"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " +"to be runnign." +msgstr "" + #. Plugin validator -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:77 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -17541,5 +17808,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:79 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -17548,10 +17815,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:81 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:83 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -30135,7 +30402,4 @@ #~ msgstr "Fai click en Recargar para actualizar a lista" -#~ msgid "Object" -#~ msgstr "Obxecto" - #~ msgid "" #~ "Revert the state of all currently selected objects to the version " @@ -30499,7 +30763,4 @@ #~ msgstr "Esperabase parentese de peche." -#~ msgid "Downloading..." -#~ msgstr "Descargando..." - #~ msgid "" #~ "Internal Error: cannot check conditions for no layer. Please report this " @@ -30538,7 +30799,4 @@ #~ msgid "multipolygon way ''{0}'' is not closed." #~ msgstr "a vía multipoligonal \"{0}\" non está pechada." - -#~ msgid "Deleted member ''{0}'' in relation." -#~ msgstr "Membro \"{0}\" borrado na relación." #~ msgid "Empty member in relation." @@ -30661,7 +30919,4 @@ #~ msgstr[1] "{0} obxectos teñen conflitos:" -#~ msgid "Conflicts: {0}" -#~ msgstr "Conflitos: {0}" - #~ msgid "Didn't find an historized primitive with id {0} in this dataset" #~ msgstr "" @@ -30710,5 +30965,2 @@ #~ msgid "No latest version found. History is empty." #~ msgstr "non se atopou a última versión. O historial está valeiro." - -#~ msgid "Could not read ''{0}''." -#~ msgstr "Non se puido ler \"{0}\""